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

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