Mercurial > hg

view tests/test-merge5.out @ 3639:5c9a36210662

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: simplify parsestring
author Matt Mackall <mpm@selenic.com>
date Mon, 13 Nov 2006 13:26:57 -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