diff tests/test-rebase-conflicts @ 7847:30cb79d84352

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