tests/test-convert-darcs.out

--- 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.