Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3200:e67c22bc8bba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use repo.parents and parent contexts in update
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 16:39: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