diff options
| author | June McEnroe <programble@gmail.com> | 2018-02-21 19:27:33 -0500 |
|---|---|---|
| committer | June McEnroe <programble@gmail.com> | 2018-02-21 19:27:33 -0500 |
| commit | 4a2ab5123eac872d7c16fc4ef14731d053da1f38 (patch) | |
| tree | 024f8aaedb82f80baa1086a1873cf29ba5941d7d /home/.config/git | |
| parent | Switch to and vendor Go Mono font (diff) | |
| download | src-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/config | 3 |
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 |