Skip to content
Snippets Groups Projects
Commit cf6298ff authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Introduce MergeTool support 


Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 438e4af7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 368 additions and 4 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment