tests/test-merge4.out
author Martin Geisler <mg@lazybytes.net>
Wed, 18 Aug 2010 11:59:35 +0200
changeset 11959 be33381882ad
parent 6336 4b0c9c674707
permissions -rw-r--r--
test-subrepo-paths: moved comment lines to where they belong

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)