Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3237:931288cf58a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contexts: use __getattr__ rather than try/except in changectx
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 15:17:59 -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