diff options
| -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 36b96776..119180ab 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -5,6 +5,9 @@ [commit] verbose = true +[diff] + colorMoved = default + [merge] conflictStyle = diff3 |