[PATCH] t6031-test-merge-recursive: Forgot to add file to be committed

From: Stefan Beller <stefanbeller@gmail.com>
Date: Sep 21, 2014, 20:38 UTC
Message-ID: <1411331897-17674-1-git-send-email-stefanbeller@gmail.com>

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
---
 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 a953f1b..6464a16 100755
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -13,6 +13,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.1.0.238.gce1d3a9