6543 f7d7cf4e2d Fix rebase conflict detection in git 2.26 (#10930) ...

Git changed the technique used in rebase from
simple apply-patches to use merge. This breaks
our conflict detection code.

created by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>

2020-04-03 13:09:15 -04:00

21 KiB

Raw Blame History

View Raw