diff tests/test-excessive-merge.t @ 13172:84cec5895d01

subrepo: backout f02d7a562a21 backing out f02d7a562a21 because it introduced a bug in .hgsubstate handling.
author Erik Zielke <ez@aragost.com>
date Fri, 17 Dec 2010 13:38:15 +0100
parents 4c94b6d0fb1c
children ec5886db9dc6
line wrap: on
line diff