tests/test-merge5.out
author Jose M. Prieto <jmprieto@gmx.net>
Tue, 03 Oct 2006 12:33:14 +0200
changeset 3250 e96d2956eb4a
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
util.strdate: compute timestamp using UTC, not local timezone

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