summaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2014-01-29 10:38:06 +0100
committerFlorian Pritz <bluewind@xinu.at>2014-01-29 10:38:06 +0100
commitcb12dc7400d52d8c75c600c0bd943984f603ea78 (patch)
treec1eae752c0cbe75d022b30d0fcecc7a690e7c5b2 /.gitconfig
parent72efcdab938b0aa53316f784964d9e971a06b08b (diff)
downloaddotfiles-cb12dc7400d52d8c75c600c0bd943984f603ea78.tar.gz
dotfiles-cb12dc7400d52d8c75c600c0bd943984f603ea78.tar.xz
misc cleanup
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 425f6a8..8eebcf8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,6 +20,7 @@
refl = reflog --date=relative
[merge]
tool = vimdiff
+ conflictstyle = diff3
[push]
default = current
[color]