diff tests/test-rebase-check-restore.out @ 10230:9f0c7be7c46c

merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 11 Jan 2010 21:45:28 +0100
parents b214066b7e1d
children 4bb4895e1693
line wrap: on
line diff