hongchaodeng/git_mergetool_fugitive.txt

Last active August 29, 2015 14:03

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

Download ZIP

git mergtool set to fugitive

Raw

git_mergetool_fugitive.txt

	git config --global mergetool.fugitive.cmd 'gvim -f -c "Gdiff" "$MERGED"'
	git config --global merge.tool fugitive

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