tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 13 Jun 2007 21:39:45 -0300
changeset 4577 e7d4ed543de5
parent 3592 fffc8a733bf9
permissions -rw-r--r--
localrepo.status: only append stuff to the clean list if list_clean is true This is consistent with dirstate.status.

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