# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1424640768 -7200
# Node ID 17d67f65193b819da822f8539ceea3345795394f
# Parent  2a20e23423d69f8da43cb6eadaed40492a5aa2bd
merge.conflictstyle diff3

diff -r 2a20e23423d6 -r 17d67f65193b .gitconfig
--- a/.gitconfig	Sun Feb 22 23:22:23 2015 +0200
+++ b/.gitconfig	Sun Feb 22 23:32:48 2015 +0200
@@ -46,6 +46,9 @@
 # detection; equivalent to the git diff option -l.
 # renamelimit = 0
 
+[merge]
+conflictstyle = diff3
+
 [log]
 date = iso