On Fri, Oct 23, 2020 at 9:01 AM Elijah Newren via GitGitGadget
[off-list ref] wrote:

From: Elijah Newren <redacted>

Signed-off-by: Elijah Newren <redacted>
---
 t/t6423-merge-rename-directories.sh | 37 ++++++++++++++++-------------
 1 file changed, 21 insertions(+), 16 deletions(-)

Whoops, I had meant for this last patch to be kept local for now and
only send it in after adding more of the merge-ort implementation.  To
make matters worse, it's slightly out of date with what I have on my
'ort' branch.  Oh, well, I guess it doesn't hurt...at least not if I
get the up-to-date version of the changes.  I'll include those in v2,
along with the small change Junio highlighted for patch 1, but wait a
few days for more feedback to come in on this series.