diff options
| author | Dan Davison <dandavison7@gmail.com> | 2021-11-29 20:54:48 -0500 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2021-12-05 11:25:05 -0500 |
| commit | 6745f42ddadeccfa30628c70d39b8f9abbff35f0 (patch) | |
| tree | 19cdd504eba5632d6bb0d6a72559b1ee1774c057 /README.md | |
| parent | e7294060ef3b8af0d2307eea4359123232f85646 (diff) | |
Display merge conflicts
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -27,6 +27,9 @@ [delta] navigate = true +[merge] + conflictstyle = diff3 + [diff] colorMoved = default |