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

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