Mercurial > hg

view tests/test-merge5.out @ 3783:4421cef5d3f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make quoting in test-encoding simpler
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Dec 2006 14:32:02 -0600
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