tests/test-mq-qdiff.out
author Matt Mackall <mpm@selenic.com>
Mon, 04 Dec 2006 17:10:31 -0600
changeset 3786 6398ff7cb705
parent 2904 8ca608c1eb02
permissions -rw-r--r--
imported patch collision

% 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