diff tests/test-rebase-pull.out @ 10543:dd3526162436 stable

merge with default
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 24 Feb 2010 18:35:05 +0100
parents a3d73b3e1f8a
children 6227c8d669d5
line wrap: on
line diff