diff tests/test-revert.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 ea2a9c13afc6
children 281f9f8f1bd4 03a665f9f913
line wrap: on
line diff