Merge branch 'sb/t6031-typofix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2014 19:36:14 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2014 19:36:14 +0000 (12:36 -0700)
* sb/t6031-typofix:
t6031-test-merge-recursive: do not forget to add file to be committed

t/t6031-merge-recursive.sh
index a953f1b55cc26aae703d3c84f74df3265cc2ed57..6464a16a192f495c5aab5ec1af17d3e17acaded6 100755 (executable)
@@ -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 &&