comparison tests/test-simplemerge-cmd @ 6531:c2c4fa9af016

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 12 Apr 2008 23:05:51 -0400
parents c6413f8f2f8e
children e1f4343db740
comparison
equal deleted inserted replaced
6530:4b92591c69a7 6531:c2c4fa9af016