Mercurial > hg > gitweb

view tests/test-merge4.out @ 3706:0d810798acb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use 'bundletype' instead of 'type' to not shadow built-in function.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 22 Nov 2006 22:33:57 +0100
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)