Merge branch 'sb/t6031-typofix'

* sb/t6031-typofix:
t6031-test-merge-recursive: do not forget to add file to be committed

diff --combined t/t6031-merge-recursive.sh
index a953f1b55cc26aae703d3c84f74df3265cc2ed57,c8bd6da0cb060e36ff092b2773cdcd310c46e105..6464a16a192f495c5aab5ec1af17d3e17acaded6
--- 1/t/t6031-merge-recursive.sh
--- 2/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@@ -2,6 -2,7 +2,6 @@@
  
  test_description='merge-recursive: handle file mode'
  . ./test-lib.sh
 -. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh
  
  test_expect_success 'mode change in one branch: keep changed version' '
        : >file1 &&
@@@ -13,6 -14,7 +13,7 @@@
        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 &&