diff tests/test-merge-commit.t @ 14016:bd738875943a

merge with stable
author Martin Geisler <mg@aragost.com>
date Tue, 26 Apr 2011 13:13:35 +0200
parents b00eda50ad2b
children ec5886db9dc6
line wrap: on
line diff