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

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