- rcrnstn/dotfiles-git
- Commit 9d589e56c7f61dbaf901938ef894562ed89bdfab
|
...
|
...
|
@@ -43,3 +43,14 @@
|
|
43
|
43
|
[merge]
|
|
44
|
44
|
ff = false
|
|
45
|
45
|
autoStash = true
|
|
|
46
|
+ conflictStyle = diff3
|
|
|
47
|
+
|
|
|
48
|
+[am]
|
|
|
49
|
+ threeWay = true
|
|
|
50
|
+
|
|
|
51
|
+[rerere]
|
|
|
52
|
+ enabled = true
|
|
|
53
|
+
|
|
|
54
|
+[diff]
|
|
|
55
|
+ renames = copies
|
|
|
56
|
+ algorithm = histogram
|
git.rcrnstn.net