comparison tests/test-simplemerge-cmd @ 9552:f0417b6ff98a

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Oct 2009 00:59:46 -0500
parents 0eb8c4df61bd
children
comparison
equal deleted inserted replaced
9551:3e698434b990 9552:f0417b6ff98a