pavelburov/.gitconfig

Created April 30, 2019 10:05

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

Download ZIP

Configuring KDiff3 as mergetool for git

Raw

	[merge]
	tool = kdiff3

	[mergetool "kdiff3"]
	cmd = kdiff3.exe $BASE $LOCAL $REMOTE -o $MERGED --L2 'Local' --L3 'Remote'

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