Mercurial > hg-stable

view tests/test-merge4.out @ 5276:694eb9ccb54d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/subversion: Use util.set() instead of set() for python2.3 compatibility
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 31 Aug 2007 13:14:03 +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)