tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 31 Jul 2007 16:28:05 -0700
changeset 5036 ca0d02222d6a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
ui: get readline and prompt to behave better depending on interactivity

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