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

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