{"thread":{"id":"37612","subject":"[PATCH] t6031-test-merge-recursive: Forgot to add file to be committed","startedAt":"2014-09-21T20:38:17Z","lastAt":"2014-09-21T20:38:17Z","messageCount":1,"participants":["Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"249728","messageId":"1411331897-17674-1-git-send-email-stefanbeller@gmail.com","threadId":"37612","inReplyTo":null,"subject":"[PATCH] t6031-test-merge-recursive: Forgot to add file to be committed","fromName":"Stefan Beller","fromEmail":"stefanbeller@gmail.com","sentAt":"2014-09-21T20:38:17Z","receivedAt":"2014-09-21T20:38:17Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"Signed-off-by: Stefan Beller <stefanbeller@gmail.com>\n---\n t/t6031-merge-recursive.sh | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh\nindex a953f1b..6464a16 100755\n--- a/t/t6031-merge-recursive.sh\n+++ b/t/t6031-merge-recursive.sh\n@@ -13,6 +13,7 @@ test_expect_success 'mode change in one branch: keep changed version' '\n \tgit commit -m a &&\n \tgit checkout -b b1 master &&\n \ttest_chmod +x file1 &&\n+\tgit add file1 &&\n \tgit commit -m b1 &&\n \tgit checkout a1 &&\n \tgit merge-recursive master -- a1 b1 &&\n-- \n2.1.0.238.gce1d3a9\n"}]}