Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5345:002fe2f364f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: fix missing import
author Patrick Mezard <pmezard@gmail.com>
date Sun, 30 Sep 2007 12:08:33 +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