Mercurial > hg

view tests/test-merge5.out @ 4691:ca4971347e0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
purge: don't delete ignored files if --all is not specified
author Emanuele Aina <em@nerd.ocracy.org>
date Wed, 06 Jun 2007 22:17:35 +0200
parents fffc8a733bf9
children 4b0c9c674707
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