document.write("
Open git-bash
and type
git config --global merge.tool p4merge\ngit config --global mergetool.p4merge.cmd "p4merge \\"$BASE\\" \\"$LOCAL\\" \\"$REMOTE\\" \\"$MERGED\\""\ngit config --global mergetool.p4merge.trustExitCode false\ngit config --global mergetool.keepBackup false\ngit config --global diff.tool p4merge\ngit config --global difftool.p4merge.cmd "p4merge \\"$LOCAL\\" \\"$REMOTE\\""\n
\nThe .gitconfig
should look like this
[merge] keepBackup = false tool = p4merge [mergetool] prompt = false [mergetool "p4merge"] cmd = p4merge \\"$BASE\\" \\"$LOCAL\\" \\"$REMOTE\\" \\"$MERGED\\" keepTemporaries = false trustExitCode = false keepBackup = false [diff] tool = p4merge [difftool] prompt = false [difftool "p4merge"] cmd = p4merge \\"$LOCAL\\" \\"$REMOTE\\" keepTemporaries = false trustExitCode = false keepBackup = false