diff tests/test-up-local-change @ 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 e506c14382fd
children 096f1c73cdc3
line wrap: on
line diff