bregenspan/.gitconfig

Created May 25, 2013 00:53

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/bregenspan/5647470.js"></script>
Save bregenspan/5647470 to your computer and use it in GitHub Desktop.

Download ZIP

Git merge config to use Meld as merge tool (with the middle pane representing the merge target, unlike the crappy default where middle pane is BASE)

Raw

	[merge]
	tool = mymeld
	conflictstyle = diff3
	[mergetool "mymeld"]
	cmd = meld --diff $LOCAL $MERGED $REMOTE

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