tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Mon, 18 Jun 2007 19:43:26 -0500
changeset 4631 e3afa670e484
parent 2175 b2ae81a7df29
permissions -rw-r--r--
demandimport: fix issue579 and add a test fix suggested by Brendan

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)