diff tests/test-extdiff.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 8fd6925ae32f
children 49966b5ab16f
line wrap: on
line diff