diff tests/test-merge-default @ 3099:09e8aecd8016

Merge with backout
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Sep 2006 16:01:16 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff