tests/test-merge5.out
author Markus F.X.J. Oberhumer <markus@oberhumer.com>
Mon, 25 Jun 2007 14:46:20 +0200
changeset 4706 f0aa759b8f93
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Makefile: change "make local" to build a fully working local version.

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