Mercurial > hg

view tests/test-merge5.out @ 6346:8e3b651382f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved semantics for remove (issue438) - Added files are never deleted (only removed with --force). - Modified files can only be removed with --force. - With --after, only deleted files are removed. - With --after --force, all files are removed but not deleted.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 22 Mar 2008 10:07:49 +0100
parents 4b0c9c674707
children 6aa4a3fa4e60
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes