diff tests/test-rebase-conflicts.out @ 7500:ab3fb222b345

merge changes from stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 10 Dec 2008 11:30:11 +0100
parents 45495d784ad6
children 4bb4895e1693
line wrap: on
line diff