Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 5031:af0995261f02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extensions: don't get confused by aliasing between "foo" and "hgext.foo"
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 30 Jul 2007 14:53:03 -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)