Using CodeMerge with Git Bash
Posted: Mon 09 Jul 2012 19:17
I'm trying to setup CodeMerge to be my default mergetool. I followed the configurations outlined here: http://stackoverflow.com/questions/9627 ... tool-setup
This worked perfectly for when I used it for diffing files. However when I tried to use the merge tool, it doesn't even open the program. It immediately fails and gives me:
Any help would be appreciated, thanks.
This worked perfectly for when I used it for diffing files. However when I tried to use the merge tool, it doesn't even open the program. It immediately fails and gives me:
I am currently using the latest demo, and contemplating on getting the pro version depending on whether or not I can get this to work. I should mention that I can get code merge to work using tortoiseGit, but I prefer to do most of my work via Git Bash.$ git mergetool
Merging:
check.txt
Normal merge conflict for 'check.txt':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (codecompare):
merge of check.txt failed
Any help would be appreciated, thanks.