From: Junio C Hamano Date: Tue, 15 Oct 2019 04:56:44 +0000 (+0900) Subject: Merge branch 'en/merge-recursive-directory-rename-fixes' into next X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebfdc3ff7b20064fc7fab04f761f5095ba5c3a05;p=git Merge branch 'en/merge-recursive-directory-rename-fixes' into next A few glitches in the heuristic in merge-recursive to infer file movements based on movements of other files in the same directory have been corrected. * en/merge-recursive-directory-rename-fixes: merge-recursive: fix merging a subdirectory into the root directory merge-recursive: clean up get_renamed_dir_portion() --- ebfdc3ff7b20064fc7fab04f761f5095ba5c3a05