Mercurial > hg

view tests/test-merge4.out @ 7465:8f0305874701

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: allow cvs import to reorder its filename list Also fix script to generate non-zero length test file b.
author Frank Kingswood <frank@kingswood-consulting.co.uk>
date Mon, 01 Dec 2008 13:42:04 +0000
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)