diff tests/test-merge-types.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 28e2e3804f2e
children e0348815e806
line wrap: on
line diff