summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 57cce4d3..a85022db 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
[delta]
navigate = true
-
+
[merge]
conflictstyle = diff3