diff tests/test-merge-default.t @ 13869:b470894c33f8

date: fixup breakage from ">" fix
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 09:39:22 -0500
parents 4134686b83e1
children 41885892796e 6c8573dd1b6b
line wrap: on
line diff