Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 2713:85070b784896

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test-mq-qnew-twice exit code and output.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Jul 2006 09:00:30 +0200
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)