SourceGear Support

Disregard this post

Forgot to mention an important point: when this prompt comes up in SVN: Conflict discovered in 'Admin/SA_prod_edit.asp'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: You need to hit the 'L' key and hit enter to bring up the merge too...

Figured it out. Was *not* easy, either! Create a shell script called svnmerge and set your SVN_MERGE env var to that, or use the merge-tool-cmd option in your ~/.subversion/config file. Here's svnmerge: #!/bin/sh diffmerge -m -t1="Theirs" -t2="Merged" -t3="Mine" -r=$4 $...

I'm using svn command line version on the Mac. I figured out how to get 'svn diff' to use DiffMerge properly: I basically make my own shell script and set the diff-cmd to that. I'll share it here in case anyone else finds it useful: #!/bin/sh diffmerge -u -t1="$3" -t2="$5" $6 $7 ...

Ahh man! So close. Thanks Jeff, that is a totally killer feature that would make DiffMerge a totally complete package.

And thanks for keeping this free!

I can compare two folders, which is great, but the obvious option to copy a file from the left folder to the right folder (or vice versa) is missing. It would be great if there was a copy left/right button. This alone is something I'd pay money for, it's that valuable.