Skip to content

Instantly share code, notes, and snippets.

@tjweir

tjweir/gist:134107

Created June 22, 2009 18:22
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save tjweir/134107 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save tjweir/134107 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
[merge]
tool = mvim
[mergetool "mvim"]
cmd = <path to mvim>mvim -d -g "$LOCAL" "$MERGED" "$REMOTE"
keepBackup = false
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment