Merge branch 'kn/git-cd-to-empty'

diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 55d549fcf441be927bc43b2c41107a90aa614c2a..8c9823765e66aca886a1ec32a8ad523c1c28e1bc 100755 (executable)
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -76,7 +76,8 @@ test_expect_success 'moves and renames' '
 
        git diff-tree three four -r --name-status -B -M | sort >actual &&
        {
-               echo "R100      foo     bar"
+               # see -B -M (#6) in t4008
+               echo "C100      foo     bar"
                echo "T100      foo"
        } | sort >expect &&
        test_cmp expect actual