diff tests/test-rebase-conflicts.out @ 12607:1393a81b3bdc

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