foobit/gist:5126115

Created March 9, 2013 22:46

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/foobit/5126115.js"></script>
Save foobit/5126115 to your computer and use it in GitHub Desktop.

Download ZIP

Configure p4merge as git's default merge/diff tool

Raw

gistfile1.sh

	git config --global merge.tool p4merge
	git config --global mergetool.p4merge.trustExitCode false

	git config --global diff.tool p4merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment