Mercurial > hg

view tests/test-merge5.out @ 6025:f2335246e5c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: wrap quotes around tool path
author Steve Borho <steve@borho.org>
date Mon, 04 Feb 2008 19:38:34 -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