aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/%HOME%
diff options
context:
space:
mode:
Diffstat (limited to '%HOME%')
-rw-r--r--%HOME%/.gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig
index 9312ee4..096029d 100644
--- a/%HOME%/.gitconfig
+++ b/%HOME%/.gitconfig
@@ -41,6 +41,9 @@
# Follow renames:
follow = true
+[merge]
+ # Show the common ancestor when resolving a conflict:
+ conflictStyle = diff3
[mergetool]
# I don't even know why those are necessary, since we can abort and
# retry merges.