Skip to content

Instantly share code, notes, and snippets.

@guillermocalvo

guillermocalvo/diff-via-winmerge.cfg

Created July 6, 2021 13:15
Show Gist options
  • Save guillermocalvo/f8bd58e997b2146fef187888e904a901 to your computer and use it in GitHub Desktop.
Save guillermocalvo/f8bd58e997b2146fef187888e904a901 to your computer and use it in GitHub Desktop.
Download ZIP
TortoiseGit
Raw
diff-via-winmerge.cfg
C:\Program Files\WinMerge\WinMergeU.exe /e /ub /fr /wl /wm /dl %bname /dr %yname %base %mine
Raw
merge-via-winmerge.cfg
C:\Program Files\WinMerge\WinMergeU.exe /e /ub /fr /wl /wm /dl %bname /dm %tname /dr %yname %base %theirs %mine /o %merged /ar
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment