Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5034:c0417a319e39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: move commit to cmdutil as wrapper for commit-like functions
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Jul 2007 16:28:05 -0700
parents fffc8a733bf9
children
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