Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t3903: stop hard-coding commit sha1s
[gitweb.git]
/
t
/
t6031-merge-recursive.sh
diff --git
a/t/t6031-merge-recursive.sh
b/t/t6031-merge-recursive.sh
index a953f1b55cc26aae703d3c84f74df3265cc2ed57..6464a16a192f495c5aab5ec1af17d3e17acaded6 100755
(executable)
--- 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 &&