tests/test-merge4.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 28 Nov 2007 11:54:39 -0600
changeset 5564 b4af2dd9868a
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
hgweb: account for Python 2.4 in one test

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)