tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Mon, 13 Nov 2006 13:26:57 -0600
changeset 3646 b4ad640a3bcf
parent 2175 b2ae81a7df29
permissions -rw-r--r--
templates: move changeset templating bits to cmdutils

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)