-
-
Save darong-khalibre/8345924 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git config --global merge.tool p4merge | |
| git config --global mergetool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"' | |
| git config --global diff.tool p4merge | |
| git config --global difftool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
settings on ~/.gitconfig
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = p4merge.exe "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = p4merge.exe "$LOCAL" "$REMOTE"
[mergetool]
keepBackup = false
prompt = false
[difftool]
keepBackup = false
prompt = false