tests/test-mq-qdiff.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 27 Aug 2007 13:38:34 -0700
changeset 5257 fd371f99f20b
parent 2916 8ca608c1eb02
child 5863 3d1f9dcecdea
permissions -rw-r--r--
Automated merge with http://hg.intevation.org/mercurial/crew

% init
% commit
adding base
% qnew mqbase
% qrefresh
% qdiff
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@ base
-base
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@ base
-base
+patched