tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 09 Aug 2007 20:03:34 -0700
changeset 5139 49554ba98951
parent 3592 fffc8a733bf9
permissions -rw-r--r--
debugstate: print symlinks as 'lnk', not '777'

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