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

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