Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3775:a88e02081a88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add global options for setting encoding and encodingmode
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Dec 2006 16:16:33 -0600
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