comparison tests/test-simplemerge-cmd @ 7541:11660d2918af

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Dec 2008 16:27:51 -0600
parents c6413f8f2f8e
children e1f4343db740
comparison
equal deleted inserted replaced
7540:f1069e7f5635 7541:11660d2918af