tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 18 Jun 2007 17:49:56 -0500
changeset 4630 e6d105a51ec7
parent 3592 fffc8a733bf9
permissions -rw-r--r--
dispatch: add generic pre- and post-command hooks

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes