commit 67157248154a23138c2b7ff2eebecbdf3d079ef7 from: Neels Hofmeyr date: Fri Nov 06 02:12:56 2020 UTC fix patience: off-by-one preventing swallow the same identical line twice commit - ede78929bedd695e06a0c30839b9a561b5d6bc9c commit + 67157248154a23138c2b7ff2eebecbdf3d079ef7 blob - a845cbd14cd84545c0356b938d9ecc930f7f9890 blob + 71371779dde10d2eea855d4434f62c2b74b4e87b --- lib/diff_patience.c +++ lib/diff_patience.c @@ -389,7 +389,7 @@ diff_atoms_swallow_identical_neighbors(struct diff_dat * common-unique line in a previous iteration. */ for (identical_l.start = l_idx, identical_r.start = r_idx; - identical_l.start > l_min && identical_r.start > 0; + identical_l.start > (l_min+1) && identical_r.start > 0; identical_l.start--, identical_r.start--) { bool same; int rc = diff_atom_same(&same,