Configure TortoiseSVN
  • SourceGear DiffMerge integration
    • Diff: C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe /ro2 /t1=%bname /t2=%yname %base %mine
    • Merge: C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe /r=%merged /t1=%yname /t2=%bname /t3=%tname /c=%mname %mine %base %theirs
    • Source: http://yoopergeek.blogspot.com/2007/09/diff-merge-tools.html
  • Settings -> General -> Global ignore pattern -> add *bin* *Bin* *.resharper *.user *obj* *.suo
Unless otherwise stated, the content of this page is licensed under Creative Commons Attribution-ShareAlike 3.0 License