Yoy can try the program 'meld'
https://meldmerge.org/ Sent with ProtonMail Secure Email. ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ On Wednesday, May 13, 2020 6:30 AM, Zenaan Harkness <z...@freedbms.net> wrote: > Any diff (or git diff) gurus around? > > I often review one text document file against an updated file, and wish to > view each pair of lines for differences, so are there some combo of options > to diff or git diff, to show the diffs in a repeated pair-wise fashion - > i.e., just a single old line, followed by its modified new line, then repeat > (and never group old lines, or new lines)? > > Default diff and git diff behaviour is to aggregate as many 'old' lines as > have been changed in localised group of lines (the "-" minus lines), followed > by an aggregate of the correspondingly changed 'new' lines in a group (the > "+" plus lines). > > When groups of lines are aggregated like this, it is hard to do a pairwise > review of each of pair of lines (old line, immediately followed by new line). > > Sometimes this would even be beneficial when reviewing code, but mostly for > reviewing text documents. > > TIA,
