diff tests/test-simplemerge-cmd @ 11681:c5e555e064d0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 25 Jul 2010 21:20:05 -0500
parents 0eb8c4df61bd
children
line wrap: on
line diff