Re: [PATCH 11/30] directory rename detection: testcases exploring possibly suboptimal merges
On Tue, Nov 14, 2017 at 12:33 PM, Stefan Bellerwrote: > On Fri, Nov 10, 2017 at 11:05 AM, Elijah Newren wrote: >> +# Possible Resolutions: >> +# Previous git: y/{a,b,f}, z/{c,d}, x/e >> +# Expected: y/{a,b,e,f}, z/{c,d} >> +# Preferred:
[PATCH 11/30] directory rename detection: testcases exploring possibly suboptimal merges
Signed-off-by: Elijah Newren--- t/t6043-merge-rename-directories.sh | 371 1 file changed, 371 insertions(+) diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh index 115d0d2622..bdfd943c88 100755 ---