Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'db/delta-applier' into svn-fe
[gitweb.git]
/
t
/
t6010-merge-base.sh
diff --git
a/t/t6010-merge-base.sh
b/t/t6010-merge-base.sh
index 62197a3d35f257dee6545d0f7768f21242e696ca..082032edc36268f1b8e26ca6f409080093ac0f2b 100755
(executable)
--- a/
t/t6010-merge-base.sh
+++ b/
t/t6010-merge-base.sh
@@
-131,7
+131,7
@@
test_expect_success 'unsynchronized clocks' '
R2=$(doit 3 R2 $R1) &&
PL=$(doit 4 PL $L2 $C2) &&
- PR=$(doit 4 PR $C2 $R2)
+ PR=$(doit 4 PR $C2 $R2)
&&
git name-rev $C2 >expected &&