Mercurial > hg-stable

view tests/test-merge5.out @ 6280:9db24a36d182

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: check filename is /dev/null for creation or deletion (issue 1033) Otherwise, file creation or deletion is ambiguous with file being filled or emptied.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 16 Mar 2008 00:35:12 +0100
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