diff tests/test-rename-merge1.t @ 12607:1393a81b3bdc

merge with stable
author Martin Geisler <mg@aragost.com>
date Fri, 01 Oct 2010 16:43:03 +0200
parents f254204d8b8d
children ada47c38f4e5
line wrap: on
line diff