diff tests/test-mq-merge.out @ 7847:30cb79d84352

resolve: keep .orig files
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents fb32ae9c76e7
children 9a398dd53bcc
line wrap: on
line diff