tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Sat, 05 Aug 2006 14:59:47 -0700
changeset 2787 8ec1b1f0a5f7
parent 2175 b2ae81a7df29
permissions -rw-r--r--
mq: use more portable util.parse_patch_output instead of handrolled version.

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