Mercurial > hg

view tests/test-merge5.out @ 3918:a413f5c29c46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test-hup for different output of ls on at least MacOS X and Solaris 8.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 16 Dec 2006 23:24:30 +0100
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