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

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