diff tests/test-status.out @ 3163:a9e75b371315

merge: move partial filtering out of manifest merge
author Matt Mackall <mpm@selenic.com>
date Tue, 26 Sep 2006 16:21:52 -0500
parents 5c10b7ed3411
children 5155fa27f514
line wrap: on
line diff