diff options
-rw-r--r-- | home/.config/git/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config index 119180ab..1a6d5ce1 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -7,6 +7,7 @@ [diff] colorMoved = default + colorMovedWS = allow-indentation-change [merge] conflictStyle = diff3 |