[PATCH] tests: make test-convert-darcs.t happier with modernish darcs

[Bryan O'Sullivan]

# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1336811967 -7200
# Node ID 1bafc0976031868d959312ae0d1a2181d07d34a4
# Parent  2585fa6281a11c2d34df92275b84e1925da8ecf1
tests: make test-convert-darcs.t happier with modernish darcs

diff -r 2585fa6281a1 -r 1bafc0976031 tests/test-convert-darcs.t
--- a/tests/test-convert-darcs.t	Sat May 12 10:29:09 2012 +0200
+++ b/tests/test-convert-darcs.t	Sat May 12 10:39:27 2012 +0200
@@ -32,7 +32,7 @@
 
 branch and update
 
-  $ darcs get darcs-repo darcs-clone >/dev/null
+  $ darcs get -q darcs-repo darcs-clone >/dev/null
   $ cd darcs-clone
   $ echo c >> a
   $ echo c > c
@@ -48,11 +48,10 @@
   $ darcs record -a -l -m p1.2
   Finished recording patch 'p1.2'
 
-  $ darcs pull -a --no-set-default ../darcs-clone
+  $ darcs pull -q -a --no-set-default ../darcs-clone
   Backing up ./a(-darcs-backup0)
   We have conflicts in the following files:
-  ./a
-  Finished pulling and applying.
+  ./a (no-eol)
   $ sleep 1
   $ echo e > a
   $ echo f > f