Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
---
t/t6031-merge-recursive.sh | 1 +
1 file changed, 1 insertion(+)
Show changes to t/t6031-merge-recursive.sh +1 −0
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
Stefan Beller