Mercurial > hg

view tests/test-merge4.out @ 2701:f12d2e5b97fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged backout head.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 27 Jul 2006 18:53:31 +0200
parents b2ae81a7df29
children 4b0c9c674707
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)