tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 18 Jul 2007 14:00:55 -0700
changeset 4919 53a1847a99d1
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Simplify update.

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