dc692ea796
fixed typos ( #1553 )
2023-11-18 10:11:11 -05:00
6745f42dda
Display merge conflicts
2021-12-05 11:25:05 -05:00
e7294060ef
Example diffs
2021-12-05 11:25:05 -05:00
580a1e88ad
Cthulhu commit diff
...
https://github.com/torvalds/linux/commit/2cde51fbd0f310c8a2c5f977e665c0ac3945b46d
https://www.destroyallsoftware.com/blog/2017/the-biggest-and-weirdest-commits-in-linux-kernel-git-history
2021-12-04 15:58:20 -05:00
8a275c3617
Styles demo commit
...
The diff in this commit contains sections with all of the following semantics:
minus-style (old line 1)
plus-style (new line 1)
zero-style (line 2)
minus-non-emph-style (old line 4, and unchanged sections of old line 3)
minus-emph-style (deleted word "chaffinch" in old line 3)
plus-non-emph-style (new line 3, and unchanged sections of new line 4)
plus-emph-style (added word "dodo" of new line 4)
2021-11-28 18:28:22 -05:00
b0eab4187e
Initial file state
2021-11-28 18:28:22 -05:00
7d2ac30357
802 fix color moved side by side panic ( #803 )
...
Append newline character when preparing raw line
Fixes #802
2021-11-26 23:41:25 -05:00
5dc0d6ef7e
New option to map raw styles encountered in input
...
Unify handling of styles parsed from raw line and computed diff
styles. This enables syntax highlighting to be used in color-moved
sections.
Fixes #72
2021-11-23 19:30:36 -05:00
5e02d340a8
662 submodule diffs ( #699 )
2021-08-22 11:25:39 -07:00
f501e23887
308 side by side tabs ( #459 )
...
* Add #308 bug reproduction
delta --no-gitconfig --diff-highlight --side-by-side < etc/examples/308-side-by-side-tabs.diff
* Expand tabs under diff-highlight and diff-so-fancy
Fixes #308
2020-12-23 13:03:34 +00:00
1a5959a6d3
Commit test examples
2020-12-05 23:24:39 +00:00
cfd6ed0e07
Reorganize
2020-08-05 16:37:09 -04:00
Fritz Rehde
Dan Davison