Junio C Hamano 0bdaec1d3d Merge branch 'en/disable-dir-rename-in-recursive-merge' ...

"merge-recursive" hit a BUG() when building a virtual merge base
detected a directory rename.

* en/disable-dir-rename-in-recursive-merge:
  merge-recursive: avoid directory rename detection in recursive case

2019-08-08 14:26:10 -07:00

111 KiB

Raw Blame History

View Raw