diff tests/test-rebase-conflicts @ 10044:dc5462d94a72

Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sat, 12 Dec 2009 16:54:33 +0100
parents 8766fee6f225
children b345b1cc124f
line wrap: on
line diff