Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4599:88fc92b0b821

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: page patchbomb messages only if PAGER is defined. Paging is complicated under win32. It is just better to avoid it by default.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 17 Jun 2007 20:35:43 +0200
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