Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5417:b8872655f951

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk: allow any extdiff command for visual diff
author TK Soh <teekaysoh@yahoo.com>
date Mon, 08 Oct 2007 11:18:34 +0800
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