diff tests/test-merge-prompt.out @ 10016:8a0af23af5d1

export: fix tests
author Matt Mackall <mpm@selenic.com>
date Fri, 04 Dec 2009 13:59:33 -0600
parents 01ada7b1861d
children
line wrap: on
line diff