tests/test-issue619.out
author Matt Mackall <mpm@selenic.com>
Wed, 02 Apr 2008 18:47:17 -0500
changeset 6452 d93f2f39bef4
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
coal: more tweaks - add revision numbers to changeset, browse, and file pages - add revision number to revision number navigator in log - remove node from log and filelog pages - add changeset, browse, and archive buttons back to log page - make buttons more clickable with display: block - fix alignment of some table heads

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