view tests/test-merge-symlinks.hg @ 7847:30cb79d84352

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

(binary:application/octet-stream)