diff tests/test-merge-default @ 3117:920f54a2249e

merge: more simplification of m2 manifest scanning
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:10:54 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff