t6031-test-merge-recursive: do not forget to add file to be committed
Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Sep 21, 2014 at 22:38 UTC
8c3419bdbd5b49892c28ef32af80e0d570e5d7a5
1 file changed
+1
t/t6031-merge-recursive.sh
+1
@@ -14,6 +14,7 @@ test_expect_success 'mode change in one branch: keep changed version' '
14
git commit -m a &&
15
git checkout -b b1 master &&
16
test_chmod +x file1 &&
17
+ git add file1 &&
18
git commit -m b1 &&
19
git checkout a1 &&
20
git merge-recursive master -- a1 b1 &&