tests/test-merge4.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 20 Jul 2008 19:09:00 +0200
changeset 6810 8f7a2915170a
parent 6336 4b0c9c674707
permissions -rw-r--r--
localrepo: fix status() typos from 854b907527e5a and 97c12b1ed1e0

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)