summary refs log tree commit diff
path: root/home/.config/git/config
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-02-21 19:27:33 -0500
committerJune McEnroe <june@causal.agency>2018-02-21 19:27:33 -0500
commited379819489db2b257d51f024c0518fb5beb804c (patch)
tree46e46d0ee29667fefba4e8ddf381b1108f7c44cb /home/.config/git/config
parentSwitch to and vendor Go Mono font (diff)
downloadsrc-ed379819489db2b257d51f024c0518fb5beb804c.tar.gz
src-ed379819489db2b257d51f024c0518fb5beb804c.zip
Git config merge.conflictStyle diff3
This is probably a good idea, though I haven't run into a merge conflict
yet.
Diffstat (limited to 'home/.config/git/config')
-rw-r--r--home/.config/git/config3
1 files changed, 3 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config
index cb38682c..5780def4 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -5,6 +5,9 @@
 [commit]
     gpgSign = true
 
+[merge]
+    conflictStyle = diff3
+
 [rebase]
     autosquash = true