diff tests/test-bad-pull @ 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 d22d730c96ed
children 7012c889e8f2
line wrap: on
line diff