tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 13 Aug 2006 15:03:48 -0700
changeset 2879 51b8d1ca7820
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
make test-diff-subdir 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