tests/test-merge5.out
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Sun, 03 Sep 2006 16:23:18 -0400
changeset 3045 8d344bc72e68
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
[churn] repo.changes was renamed to repo.status

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