Mercurial > hg
view tests/test-merge5.out @ 5529:5499dbb445de
convert: fix util.popen regression in darcs converter
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 10 Nov 2007 17:09:56 +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