Document merge conflict handling

dandavison · Dec 6, 2021 · 31b402a · 31b402a
1 parent 644e808
commit 31b402a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/README.md b/README.md
@@ -158,6 +158,7 @@ Here's what `git show` can look like with git configured to use delta:
 - Side-by-side view with line-wrapping
 - Line numbering
 - `n` and `N` keybindings to move between files in large diffs, and between diffs in `log -p` views (`--navigate`)
+- Improved merge conflict display
 - Improved `git blame` display (syntax highlighting; `--hyperlinks` formats commits as links to GitHub/GitLab/Bitbucket etc)
 - Syntax-highlights grep output from `rg`, `git grep`, `grep`, etc
 - Support for Git's `--color-moved` feature.