Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 3097:1b738357bba9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fold umap and added into m1 manifest
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 21:02:25 -0500
parents b2ae81a7df29
children
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)