comparison tests/test-rebase-conflicts @ 10546:3a69afd6987e stable

fix test output changed by 2e1a9b811d13
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 25 Feb 2010 14:35:21 +0100
parents 8766fee6f225
children b345b1cc124f
comparison
equal deleted inserted replaced
10545:b9e4a67329cd 10546:3a69afd6987e