tests/test-mq-qdiff.out
author Brendan Cully <brendan@kublai.com>
Mon, 02 Jul 2007 22:34:38 -0700
changeset 4774 38bf55d2e41f
parent 2904 8ca608c1eb02
permissions -rw-r--r--
Merge with tah

% 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