tests/test-merge5.out
author Eric Hopper <hopper@omnifarious.org>
Wed, 08 Aug 2007 22:47:30 +0200
changeset 5123 f94dbc6c7eaf
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.

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