Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t6031-test-merge-recursive: do not forget to add file to be committed
author
Stefan Beller
<stefanbeller@gmail.com>
Sun, 21 Sep 2014 20:38:17 +0000
(22:38 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 22 Sep 2014 19:46:15 +0000
(12:46 -0700)
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6031-merge-recursive.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
e6aaa39
)
diff --git
a/t/t6031-merge-recursive.sh
b/t/t6031-merge-recursive.sh
index 1cd649e245e49735afa539ab0e982036154c4797..c8bd6da0cb060e36ff092b2773cdcd310c46e105 100755
(executable)
--- a/
t/t6031-merge-recursive.sh
+++ b/
t/t6031-merge-recursive.sh
@@
-14,6
+14,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 &&