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

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