bkozora/new_gist_file_0

Created August 28, 2014 18:16

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

Download ZIP

Customize git to use custom sh we've made From http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool#The_diffconflicts_script

Raw

new_gist_file_0

git config --global merge.tool diffconflicts git config --global mergetool.diffconflicts.cmd 'diffconflicts vim $BASE $LOCAL $REMOTE $MERGED' git config --global mergetool.diffconflicts.trustExitCode true git config --global mergetool.diffconflicts.keepBackup false

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