Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rev-list: disable object/refname ambiguity check with --stdin
[gitweb.git]
/
t
/
t3509-cherry-pick-merge-df.sh
diff --git
a/t/t3509-cherry-pick-merge-df.sh
b/t/t3509-cherry-pick-merge-df.sh
index a5b6a5f3310316d289aee0961fcb6a2ae26fca99..1e5b3948dfc5d28a070ba83db361163002e7c3ae 100755
(executable)
--- a/
t/t3509-cherry-pick-merge-df.sh
+++ b/
t/t3509-cherry-pick-merge-df.sh
@@
-74,7
+74,7
@@
test_expect_success 'Setup rename with file on one side matching different dirna
echo content > sub/file &&
echo foo > othersub/whatever &&
git add -A &&
- git commit -m "Common comm
m
it" &&
+ git commit -m "Common commit" &&
git rm -rf othersub &&
git mv sub/file othersub &&