Skip to content

Instantly share code, notes, and snippets.

@jivko

jivko/gist:95418853852578678f80c4ac84b6a5d8

Created November 27, 2018 07:00
Show Gist options
  • Star 3 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save jivko/95418853852578678f80c4ac84b6a5d8 to your computer and use it in GitHub Desktop.
Save jivko/95418853852578678f80c4ac84b6a5d8 to your computer and use it in GitHub Desktop.
Download ZIP
Atom as mergetool for Git
Raw
gistfile1.txt
[mergetool "atom"]
cmd = atom -w $MERGED
trustExitCode = false
[merge]
tool = atom
conflictstyle = diff3
[mergetool]
prompt = false
keepbackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment