tests/test-issue619.out
author Jason Orendorff <jorendorff@mozilla.com>
Thu, 12 Jun 2008 07:38:15 -0500
changeset 6668 034f444902d9
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
mq: qdiff: support all diffopts

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