summary refs log tree commit diff
path: root/home/.config/git
diff options
context:
space:
mode:
authorJune McEnroe <programble@gmail.com>2018-02-21 19:27:33 -0500
committerJune McEnroe <programble@gmail.com>2018-02-21 19:27:33 -0500
commit4a2ab5123eac872d7c16fc4ef14731d053da1f38 (patch)
tree024f8aaedb82f80baa1086a1873cf29ba5941d7d /home/.config/git
parentSwitch to and vendor Go Mono font (diff)
downloadsrc-4a2ab5123eac872d7c16fc4ef14731d053da1f38.tar.gz
src-4a2ab5123eac872d7c16fc4ef14731d053da1f38.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')
-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 c34f0a9b..b7b53617 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -5,6 +5,9 @@
 [commit]
     gpgSign = true
 
+[merge]
+    conflictStyle = diff3
+
 [rebase]
     autosquash = true
 
td>June McEnroe Not much there. The illustrations are very nice though. 2024-06-09Add photos from May 31June McEnroe 2024-06-09Use monospace on photo pagesJune McEnroe 2024-06-09Put lens and (future) film at the tops of photo pagesJune McEnroe 2024-05-22Remove use of sysexits.hJune McEnroe 2024-05-22Add photo descriptions from 05-03 and 05-06June McEnroe 2024-05-21Fix = precedence in whenJune McEnroe