tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Wed, 14 Mar 2007 19:13:04 -0500
changeset 4217 3be4785f8994
parent 2175 b2ae81a7df29
permissions -rw-r--r--
tags: add --remove

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)