From 8c3419bdbd5b49892c28ef32af80e0d570e5d7a5 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Sun, 21 Sep 2014 22:38:17 +0200 Subject: [PATCH] t6031-test-merge-recursive: do not forget to add file to be committed Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- t/t6031-merge-recursive.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index 1cd649e245..c8bd6da0cb 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -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 && -- 2.11.4.GIT