Mercurial > hg

diff tests/test-convert-darcs.out @ 9525:2299c421a98e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix failing darcs test
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 06 Aug 2009 21:35:25 -0700
parents f29b7c8419cb
children 457a30ed8ffb
line wrap: on
line diff
--- a/tests/test-convert-darcs.out	Tue Sep 29 01:08:18 2009 +0200
+++ b/tests/test-convert-darcs.out	Thu Aug 06 21:35:25 2009 -0700
@@ -5,6 +5,7 @@
 % update source
 Finished recording patch 'p1.2'
 % merge branch
+Backing up ./a(-darcs-backup0)
 We have conflicts in the following files:
 ./a
 Finished pulling and applying.