projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.10.4
[platform/upstream/git.git]
/
t
/
t3412-rebase-root.sh
diff --git
a/t/t3412-rebase-root.sh
b/t/t3412-rebase-root.sh
index
0b52105
..
73a39f2
100755
(executable)
--- a/
t/t3412-rebase-root.sh
+++ b/
t/t3412-rebase-root.sh
@@
-133,7
+133,7
@@
test_expect_success 'set up second root and merge' '
rm A B C &&
test_commit 6 D &&
git checkout other &&
rm A B C &&
test_commit 6 D &&
git checkout other &&
- git merge third
+ git merge
--allow-unrelated-histories
third
'
cat > expect-third <<'EOF'
'
cat > expect-third <<'EOF'