Yanor.net/
Wiki
Blog
GitHub
Sandbox
開始行:
* DiffにWInMergeを使う [#tb4e0f36]
** 設定 [#i0bbaaf1]
git config --global merge.tool WinMerge
git config --global mergetool.WinMerge.cmd "\"C:\Program...
git config --global mergetool.prompt false
*** .gitconfig [#yb391c69]
[merge]
tool = WinMerge
[mergetool "WinMerge"]
cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe...
[mergetool]
prompt = false
** 参考 [#m5e097ec]
*** WinMerge オプション [#b0c8cd94]
http://manual.winmerge.org/Command_line.html
終了行:
* DiffにWInMergeを使う [#tb4e0f36]
** 設定 [#i0bbaaf1]
git config --global merge.tool WinMerge
git config --global mergetool.WinMerge.cmd "\"C:\Program...
git config --global mergetool.prompt false
*** .gitconfig [#yb391c69]
[merge]
tool = WinMerge
[mergetool "WinMerge"]
cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe...
[mergetool]
prompt = false
** 参考 [#m5e097ec]
*** WinMerge オプション [#b0c8cd94]
http://manual.winmerge.org/Command_line.html
ページ名: