view tests/test-merge5.out @ 2251:35fb62a3a673 0.9

fix speed regression in mdiff caused by line split bugfix.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 10 May 2006 13:39:12 -0700
parents b2ae81a7df29
children 49988d9f0758
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)