diff options
| author | Dan Davison <dandavison7@gmail.com> | 2021-12-05 20:14:14 -0500 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2021-12-05 20:14:14 -0500 |
| commit | 31b402a7cefea5c4c434280ddad32bbd7e88ac0e (patch) | |
| tree | 85da846ddfb75c84df47ddff7924c76b7f9bfb13 /README.md | |
| parent | 644e8089f74ca3107f8b172f75df66ff1330efae (diff) | |
Document merge conflict handling
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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. |