Mercurial > hg

view tests/test-merge5.out @ 6053:4e87e785c5bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: Compatibility fixes for python2.3 set -> util.set sort(reverse=True) -> sort(); reverse()
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 09 Feb 2008 13:08:02 +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