benekastah/.gitconfig

Created April 10, 2014 17:33

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

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

Download ZIP

Use vimdiff for git merges and diffs

Raw

	[diff]
	tool = vimdiff
	[difftool]
	prompt = false
	[merge]
	tool = vimdiff
	[mergetool]
	prompt = false

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