Skip to content

Instantly share code, notes, and snippets.

@rm--

rm--/git_mergetool.md

Last active October 7, 2015 21:51
Show Gist options
  • Save rm--/9a811d7b06f9fb54c24b to your computer and use it in GitHub Desktop.
Save rm--/9a811d7b06f9fb54c24b to your computer and use it in GitHub Desktop.
Download ZIP
manual mergetool selection
Raw
git_mergetool.md

osx

git mergetool -t opendiff

ubuntu linux

git mergetool -t meld

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