Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/win32-mmap'
[gitweb.git]
/
t
/
t6026-merge-attr.sh
diff --git
a/t/t6026-merge-attr.sh
b/t/t6026-merge-attr.sh
index 04c0509c476de87bfb679f1c50556ca4c3a3d615..ef0cbceafe855cfb7b0ce4d1cb5050875d587253 100755
(executable)
--- a/
t/t6026-merge-attr.sh
+++ b/
t/t6026-merge-attr.sh
@@
-176,7
+176,8
@@
test_expect_success 'up-to-date merge without common ancestor' '
test_tick &&
(
cd repo1 &&
- git pull ../repo2 master
+ git fetch ../repo2 master &&
+ git merge --allow-unrelated-histories FETCH_HEAD
)
'