tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 26 Oct 2007 16:43:13 -0700
changeset 5482 7ceb740f2fef
parent 3592 fffc8a733bf9
permissions -rw-r--r--
See if execute bit is honoured when we go back in time

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