Tuesday, January 29, 2019

gitconfig winmerge

[core]
autocrlf = true
[user]
name = Anthony
email = anthony42@
[diff]
tool = winmerge
[merge]
tool = winmerge
[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false
[mergetool "winmerge"]
prompt = false
name = WinMerge
trustExitCode = true
cmd = "D/Program\\ Files/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/D/Program\\ Files/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE

[push]
default = simple

/* ref */
https://gist.github.com/shawndumas/6158524

https://faculty-web.msoe.edu/hornick/Courses/se2030/SDL-InstallingtheGitclient-270317.pdf

https://stackoverflow.com/questions/2468230/how-to-use-winmerge-with-git-extensions

No comments:

Post a Comment