From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Sep 2014 19:36:14 +0000 (-0700)
Subject: Merge branch 'sb/t6031-typofix'
X-Git-Tag: v2.2.0-rc0~73
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12ba0e771cb1af16d0ac074a6a9656cbf45494cc?hp=-c

Merge branch 'sb/t6031-typofix'

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

12ba0e771cb1af16d0ac074a6a9656cbf45494cc
diff --combined t/t6031-merge-recursive.sh
index a953f1b55c,c8bd6da0cb..6464a16a19
--- a/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 &&