diff tests/test-incoming-outgoing.out @ 3162: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 9cceb439048b
children b2d9e553cdc8 671158f060cc
line wrap: on
line diff