Can't launch external merge tool (WinMerge) on Windows

I've set the external merge tool to be WinMerge, and I've also tried using the Custom option and pointing it to the exe-file, but I'm having trouble launching either, and I can't find any information on what the custom option needs to work.

When trying to launch external merge tool, a window pops up and disappears really quickly, and no application starts.

2 answers

1 accepted

You can only use WinMerge as an external diff tool, not as an external merge tool (that's why it's not in the list of merge tools).

Ironically despite its name, WinMerge is not a proper merge tool, it only does 2-way comparisons rather than the 3-way merge that Git uses.

Right! Ended up using Beyond Compare. I don't know how I managed to miss the "Merge tool" part and only see the "External diff tool", figures why I couldn't get any merge going. Thanks!

I guess I need to look into 3-way merge more that Steve Streetling mentions but I have setup WinMerge as an external tool.  Here are the settings needed.  It sets the display so your local file is on the right site.

The setting location: Tools->Options->Diff
  External Diff Tool: Custom
   Diff Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe
   Arguments: $LOCAL $REMOTE
  External Merge Tool: Custom 
   Merge Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe
   Arguments: /w1 $LOCAL $REMOTE $MERGED

Suggest an answer

Log in or Join to answer
Community showcase
Jason Wong
Published Tuesday in Agility Beta

Welcome to agility

Every team in the world is unique, and so   Atlassian believes   that each and every team's best way of working  needs to  be molded to their unique circumstances  – ...

430 views 6 16
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot