diff options
Diffstat (limited to '')
| -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 |