feat(git): enable rerere

aka, "Reuse Recorded Resolution"
eliasnorrby · Sep 30, 2020 · 8e516fa · 8e516fa
1 parent 275a41d
commit 8e516fa
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/shell/git/config b/shell/git/config
@@ -20,3 +20,5 @@
 	smudge = git-lfs smudge -- %f
 [pull]
 	rebase = true
+[merge]
+	conflictstyle = diff3