diff tests/test-merge-default @ 2999:fa9c769fee8a

merge: minor simplification
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:12:54 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff