Commit 8c3419bd authored by Stefan Beller's avatar Stefan Beller Committed by Junio C Hamano

t6031-test-merge-recursive: do not forget to add file to be committed

Signed-off-by: default avatarStefan Beller <stefanbeller@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent e6aaa393
......@@ -14,6 +14,7 @@ test_expect_success 'mode change in one branch: keep changed version' '
git commit -m a &&
git checkout -b b1 master &&
test_chmod +x file1 &&
git add file1 &&
git commit -m b1 &&
git checkout a1 &&
git merge-recursive master -- a1 b1 &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment