merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 95ac3f8cc813aa88d82db748af94f61150472261..2e513569477bb5efc389a2088a4d896620e50b8f 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -441,5 +441,17 @@ test_expect_success 'log.decorate configuration' '
 
 '
 
-test_done
+test_expect_success 'show added path under "--follow -M"' '
+       # This tests for a regression introduced in v1.7.2-rc0~103^2~2
+       test_create_repo regression &&
+       (
+               cd regression &&
+               test_commit needs-another-commit &&
+               test_commit foo.bar &&
+               git log -M --follow -p foo.bar.t &&
+               git log -M --follow --stat foo.bar.t &&
+               git log -M --follow --name-only foo.bar.t
+       )
+'
 
+test_done