From 609886c6cadc4e00226f3ef27557d247eeffa93a Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Mon, 28 Dec 2009 19:26:38 +0100
Subject: [PATCH] Use diff3 conflicts.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitconfig b/gitconfig
index f19f617..7f66089 100644
--- a/gitconfig
+++ b/gitconfig
@@ -52,6 +52,7 @@
     untracked = bold yellow
 [merge]
     verbosity = 1
+    conflictstyle = diff3
 [clean]
     requireForce = false
 [pack]
-- 
2.20.1