External merge tool can't open files with spaces in names

Hello,

I'm having problems using external merge tool (TortoiseMerge) with files with spaces in the file names.

If there is a conflict in a file and I choose Resolve Conflicts -> Launch External Merge Tool, the TortoiseMerge opens up but an error message comes up saying it can't find the file.

I have tried different options in Options -> Diff:

  • Using system default merge tool
  • Selecting TortoiseMerge from the merge tool drop down
  • Using custom with TortoiseMerge.exe in the command field and the file names in the arguments field with different quoting options, for example
    • -base:$BASE -mine:$LOCAL -theirs:$REMOTE -merged:$MERGED
    • -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
    • -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED"

All have resulted in the same end result: TortoiseMerge can't open the files.

Files without spaces in names open up correctly.

I'm using SourceTree 1.5.2 on Windows 7.

I use TortoiseMerge 1.8.3 as my external merge tool (system default).

Hope someone can help me with this.

Best regards,Teemu

1 answer

1 accepted

Hi Teemu,

maybe this can help :

https://github.com/msysgit/msysgit/issues/57

https://www.mail-archive.com/git@vger.kernel.org/msg17298.html

This is not really an Atlassian related problem so you might find more help on stackoverflow or so.

Best regards,

Peter

Thanks Peter,

Thanks for pointing me to the right direction.

Couldn't quite find the correct place to fix this with some quick searching the net. Easiest solution was to change the merge tool from TortoiseMerge to another tool.

Thanks for the help!

Teemu

The bug in mergetools is fixed already, but SourceTree 1.8.2.2 still does not work with TortoiseGitMerge correctly.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

797 views 0 4
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