diff tests/test-conflict.out @ 3106:7c7469d41ade

merge: pull manifest comparison out into separate function
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 16:13:03 -0500
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line diff