/設定用 WinMerge 取代 TortoiseGitMerge.bat
Last active Jan 25, 2018
| @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