diff tests/test-simplemerge-cmd @ 7847:30cb79d84352

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