view tests/test-merge4.out @ 3161:84561ea8711e

merge: move findcopies after workingmanifest
author Matt Mackall <mpm@selenic.com>
date Tue, 26 Sep 2006 16:04:07 -0500
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

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)