diff tests/test-merge4 @ 7847:30cb79d84352

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