diff tests/test-rebase-conflicts.out @ 9525:2299c421a98e

Fix failing darcs test
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 06 Aug 2009 21:35:25 -0700
parents 45495d784ad6
children 4bb4895e1693
line wrap: on
line diff