tests/test-merge5.out
author Mikael Berthe <mikael@lilotux.net>
Wed, 14 Sep 2005 12:35:10 -0500
changeset 1242 4a6efec8b698
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix hg cat when the file cannot be found in the specified revision

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)