Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5404:67d3daa8ac42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: quote "^" to avoid windows using it as an escape char.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 06 Oct 2007 21:19:06 +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