Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 4309:09c5f734ff6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix a bug where copies were getting ignored
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Apr 2007 16:25:47 -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)