tests/test-issue619.out
author Greg Ward <greg-hg@gerg.ca>
Thu, 25 Feb 2010 09:16:39 -0500
changeset 10622 bc81f126139f
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
shrink-revlog: add --sort option for user-selectable toposort algorithm.

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: can't merge with ancestor
done