* [PATCH] t6031-test-merge-recursive: Forgot to add file to be committed
@ 2014-09-21 20:38 Stefan Beller
0 siblings, 0 replies; only message in thread
From: Stefan Beller @ 2014-09-21 20:38 UTC (permalink / raw)
To: drizzd, gitster, git; +Cc: Stefan Beller
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
---
t/t6031-merge-recursive.sh | 1 +
1 file changed, 1 insertion(+)
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-21 20:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-21 20:38 [PATCH] t6031-test-merge-recursive: Forgot to add file to be committed Stefan Beller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).