Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2461:ff9ee834e3b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tidy up mtime patch of andrea, get back half of performance loss. this makes diff < 3% slower than before.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 20 Jun 2006 09:11:41 -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)