Skip to content

Instantly share code, notes, and snippets.

@vpetruchok

vpetruchok/git-merge-diff3.txt

Last active March 17, 2016 11:25
Show Gist options
  • Save vpetruchok/55eb4ff89cbbc182ef89 to your computer and use it in GitHub Desktop.
Save vpetruchok/55eb4ff89cbbc182ef89 to your computer and use it in GitHub Desktop.
Download ZIP
git merge.conflictStyle (diff3)
Raw
git-merge-diff3.txt
# 3-way merge style
git config merge.conflictstyle diff3
# 2-way merge style (by default)
git config merge.conflictstyle merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment