Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 5089:4cd52978e188

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-git-import: fake executable permissions.
author Patrick Mezard <pmezard@gmail.com>
date Mon, 06 Aug 2007 10:38:07 +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)