Skip to content

Instantly share code, notes, and snippets.

@Haruki

Haruki/git_diff_merge_tools_config.txt

Created April 18, 2017 08:53
Show Gist options
  • Save Haruki/c1805f37093c1f57e75ac106ec018801 to your computer and use it in GitHub Desktop.
Save Haruki/c1805f37093c1f57e75ac106ec018801 to your computer and use it in GitHub Desktop.
Download ZIP
configure git diff and merge (windows)
Raw
git_diff_merge_tools_config.txt
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd 'p4merge.exe $LOCAL $REMOTE'
git config --global difftool.prompt false
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge.exe $BASE $LOCAL $REMOTE $MERGED'
git config --global mergetool.prompt false
git config --global mergetool.trustExitCode false
git config --global mergetool.keepBackup false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment