tests/test-merge4.out
author Patrick Mezard <pmezard@gmail.com>
Wed, 18 Jun 2008 22:52:25 +0200
changeset 6705 fec6bc978843
parent 6336 4b0c9c674707
permissions -rw-r--r--
context: let workingctx parents be overriden

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)