Skip to content

Instantly share code, notes, and snippets.

@sumit4iit

sumit4iit/gist:e45e28f31f9fd498b1781dd93b0aedca

Forked from jivko/gist:95418853852578678f80c4ac84b6a5d8
Created March 16, 2020 21:45
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save sumit4iit/e45e28f31f9fd498b1781dd93b0aedca to your computer and use it in GitHub Desktop.
Save sumit4iit/e45e28f31f9fd498b1781dd93b0aedca 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