Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 5038:8f157190075e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: add config option to turn off use of branch names
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Jul 2007 17:18:59 -0700
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)