view tests/test-merge4.out @ 9092:9aebeea7ac00

subrepo: use hg.repository instead of creating localrepo directly this way, extensions' reposetup will be called, which allows for git subrepos to be handled by hg-git (and I believe the same goes for svn and hgsubversion)
author Abderrahim Kitouni <a.kitouni@gmail.com>
date Sat, 04 Jul 2009 14:18:15 +0100
parents 4b0c9c674707
children
line wrap: on
line source

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)