Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3235:e8199702cf4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make filectx lazier Lazy opening of filelog, lazy lookup of filenode and changeid
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 14:23:38 -0500
parents 49988d9f0758
children 41989e55fa37
line wrap: on
line source

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