diff options
Diffstat (limited to '.config/git')
| -rw-r--r-- | .config/git/config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index 66163dd..06f7209 100644 --- a/.config/git/config +++ b/.config/git/config @@ -46,6 +46,8 @@ [merge] # use vimdiff as mergetool tool = vimdiff + # this shows the ancestor + conflictstyle = diff3 [pretty] compact = %C(auto)%h%Cgreen% cs%Cblue%<(15,trunc)% an%C(auto)%d%Creset% s [push] |