comparison tests/test-merge-default @ 3441:ef2e990f9047

imported patch foo
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 22:34:43 -0500
parents 013921c753bd
children 9cd6578750b9
comparison
equal deleted inserted replaced
3440:0f1fd9854cdc 3441:ef2e990f9047