Skip to content

Instantly share code, notes, and snippets.

@doggy8088

doggy8088/設定用 WinMerge 取代 TortoiseGitMerge.bat

Last active January 25, 2018 14:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save doggy8088/83f8160c2bfdaea38f1d52f07641260f to your computer and use it in GitHub Desktop.
Save doggy8088/83f8160c2bfdaea38f1d52f07641260f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
設定用 WinMerge 取代 TortoiseGitMerge.bat
@ECHO OFF
SET DIFFTOOL="C:\Program Files (x86)\WinMerge\WinMergeU.exe -s -e -x -ul -ur -wl -dl %%bname -dr %%yname %%base %%mine"
SET MERGETOOL="C:\Program Files (x86)\WinMerge\WinMergeU.exe %%theirs %%mine %%merged"
REG ADD HKEY_CURRENT_USER\Software\TortoiseGit /v Diff /t REG_SZ /d %DIFFTOOL% /f
REG ADD HKEY_CURRENT_USER\Software\TortoiseGit /v DiffViewer /t REG_SZ /d %DIFFTOOL% /f
REG ADD HKEY_CURRENT_USER\Software\TortoiseGit /v Merge /t REG_SZ /d %MERGETOOL% /f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment