On Fri, Jan 26, 2018 at 3:37 AM, SZEDER Gábor <szeder.dev@xxxxxxxxx> wrote: > On Fri, Jan 5, 2018 at 9:26 PM, Elijah Newren <newren@xxxxxxxxx> wrote: >> Signed-off-by: Elijah Newren <newren@xxxxxxxxx> >> --- >> t/t6043-merge-rename-directories.sh | 153 ++++++++++++++++++++++++++++++++++++ >> 1 file changed, 153 insertions(+) >> >> diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh >> index f36493289..239819f2d 100755 >> --- a/t/t6043-merge-rename-directories.sh >> +++ b/t/t6043-merge-rename-directories.sh > >> +test_expect_success '3b-check: Avoid implicit rename if involved as source on current side' ' >> + ( >> + cd 3b && >> + >> + git checkout A^0 && >> + >> + test_must_fail git merge -s recursive B^0 >out && >> + test_i18ngrep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out && >> + test_i18ngrep ! CONFLICT.*rename/rename.*y/d && > > The filename argument is missing in the above line. Whoops. Good eyes; thanks for pointing it out. I'll fix it up.
