diff tests/test-convert-bzr-merges @ 7847:30cb79d84352

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