tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 16 Aug 2006 10:53:01 -0700
changeset 2925 14b4ad613dd8
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
make new tests executable.

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