diff options
Diffstat (limited to '.config/git/config')
| -rw-r--r-- | .config/git/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index 0394315..2d66d36 100644 --- a/.config/git/config +++ b/.config/git/config @@ -31,6 +31,7 @@ annotated = true [merge] conflictstyle = diff3 + tool = vimdiff [am] threeWay = true [log] |