From ba6a213c2996710aa47990be2b7ad0fb14d35660 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 18 May 2022 09:07:29 +0200 Subject: .gitconfig: merge.conflictStyle = diff3 --- %HOME%/.gitconfig | 3 +++ 1 file changed, 3 insertions(+) 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. -- cgit v1.2.3