Using TortoiseMerge for command line Subversion merging
Create a batch file called
svn_tortoisemerge.batwith the following content.
"c:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe" /base:"%1" /theirs:"%2" /mine:"%3" /merged:"%4"
SVN_MERGEenvironment variable to point to the file.
When merging conflicts use
lto launch the editor and
rto mark a conflict as resolved.
Conflict discovered in 'C:/.../somefile'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options:
Via Stack Overflow.