beaec1014e
- Update to 3.3.6: * Prevent timeouts on large differences by not doing any refinement on the large sections.
Michael Vetter2024-10-30 08:45:33 +00:00
669bcf7f2f
Accepting request 1217963 from utilities
Ana Guerrero2024-10-24 13:44:21 +00:00
7646404a87
- Update to 3.3.5: * With this release, many more conflicts are recognized, and changes vs non-changed line parts are marked much more clearly. * This release introduces a --unchanged-style=experimental command line option. Try export RIFF=--unchanged-style=experimental and report back!
Michael Vetter2024-10-24 07:58:21 +00:00
3727447ca7
Accepting request 1207061 from utilities
Ana Guerrero2024-10-11 15:03:02 +00:00
589303f11a
- Update to 3.3.4: * Both by clearly highlighting the markers, and by improving how we color the conflicting areas themselves. * And remember: "git config --global merge.conflictstyle diff3" is your friend!
Michael Vetter2024-10-11 07:02:22 +00:00
a847dcccba
Accepting request 1206039 from utilities
Ana Guerrero2024-10-07 19:52:19 +00:00
8ad9d62d51
- Update to 3.3.3: * With this release, we go from plain LCS to the Patience Diff algorithm. "Patience" is marketed as producing more human friendly diffs. * Additionally, post processing has been tuned to take better decisions on which differences should be highlighted and not.
Michael Vetter2024-10-07 08:27:53 +00:00
6fa424b938
Accepting request 1204661 from utilities
Ana Guerrero2024-09-30 13:41:22 +00:00
a89c216d5b
- Update to 3.3.2: * Tune what gets highlighted and not
Michael Vetter2024-09-30 06:25:53 +00:00
a77d276145
Accepting request 1202542 from utilities
Ana Guerrero2024-09-23 13:23:34 +00:00
6f93b05528
- Update to 3.3.1: * Tune leading whitespace lowlighting
Michael Vetter2024-09-23 07:04:05 +00:00
83baf1ba26
Accepting request 1199547 from utilities
Ana Guerrero2024-09-09 12:45:02 +00:00
c8d12e6fef
- Update to 3.2.1: * Before this release, file names were rendered in all bold. Starting with this release though, the paths are rendered in normal intensity, but the actual file names are kept bold. The goal of this is to improve readability of the output.
Michael Vetter2024-09-09 06:24:09 +00:00
a51522122f
Accepting request 1175436 from utilities
Ana Guerrero2024-05-21 16:36:35 +00:00
909427f20f
- Update to 3.1.3: * By doing our best, highlighting parse errors in the output, and then printing an error message after we're done. Before this release, we just panicked on parse errors.
Michael Vetter2024-05-13 06:51:18 +00:00
25087ca515
Accepting request 1166869 from utilities
Ana Guerrero2024-04-11 17:41:52 +00:00
ce7953a9d9
output. With this release, we now retain the existing color for lines we have no special handling for. #62 - Update to 2.30.1: * Fix crash by handling conflict markers corner cases properly
Michael Vetter2024-04-11 12:16:50 +00:00
f3cf6ee94a
Accepting request 1144103 from utilities
Ana Guerrero2024-02-05 21:01:28 +00:00
6b99864e85
- Update to 2.30.1: * Fix crash by handling conflict markers corner cases properly
Michael Vetter2024-02-05 06:35:56 +00:00
7c4a3896f8
Accepting request 1143438 from utilities
Ana Guerrero2024-02-01 17:06:34 +00:00
e5e5393d91
- Update to 2.30.0: * Option to put command line options in the RIFF environment variable and riff will use them primarily * --no-adds-only-special flag added * Improved --- and +++ headers highlighting
Michael Vetter2024-02-01 15:45:54 +00:00
bb12aee5b1
Accepting request 1142894 from utilities
Ana Guerrero2024-01-31 22:54:45 +00:00
a0eb43f1ef
- Update to 2.20.1: * Fix losing part of the diff * Align diff file timestamp
Michael Vetter2024-01-31 05:01:21 +00:00
a363ef1b0c
Accepting request 1142714 from utilities
Ana Guerrero2024-01-30 17:26:20 +00:00
6d124f56c9
- Update to 2.29.0: * Improve error handling * Improve display
Michael Vetter2024-01-30 05:48:50 +00:00
41f15871bb
Accepting request 1141443 from utilities
Ana Guerrero2024-01-25 17:41:33 +00:00
249eb20d95
- Update to 2.28.0: * Conflict markers can be added to files by git merge for example.
Michael Vetter2024-01-25 08:00:51 +00:00
08143cac49
Accepting request 1125797 from utilities
Ana Guerrero2023-11-14 20:42:39 +00:00
dc09d1affa
- Update to 2.27.1: * Don't require file names with -b #54.
Michael Vetter2023-11-14 07:00:33 +00:00
81caf3744c
Accepting request 1113297 from utilities
Ana Guerrero2023-09-25 18:03:22 +00:00
529ebadeb1
- Update to 2.27.0: * Fix crash when you remove a line starting with "--" and passed the diff to riff, riff would crash #51 As a side effect, riff will now be pickier with its input. If you modify your diffs manually, beware.
Michael Vetter2023-09-24 18:22:51 +00:00
2f6f5700b3
- Update to 2.26.0: * Add -f flag for specifying a diff file to highlight * With this release there are two ways of highlighting a particular diff file: + riff < file.diff + riff --file=file.diff * Command line parsing has been updated to use Clap, which will make help output look somewhat different. Should also fix some options parsing corner cases.
Michael Vetter2023-09-17 12:35:37 +00:00
872ebae15f
Accepting request 1110342 from utilities
Ana Guerrero2023-09-12 19:02:25 +00:00