tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Wed, 30 Jun 2010 23:56:35 -0500
branchstable
changeset 11470 34e33d50c26b
parent 6336 4b0c9c674707
permissions -rw-r--r--
subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)

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)