diff tests/test-merge1 @ 7847:30cb79d84352

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