comparison tests/test-merge5 @ 2757:787e18b84893

merge patches from brendan cully that did not apply clean against tip.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 01 Aug 2006 15:40:28 -0700
parents 39eb64b23cb5
children 41989e55fa37
comparison
equal deleted inserted replaced
2756:caa6d992608b 2757:787e18b84893