diff tests/test-conflict.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 b2ae81a7df29
children 46280c004f22
line wrap: on
line diff