tests/test-mq-qdiff.out
author Matt Mackall <mpm@selenic.com>
Tue, 10 Oct 2006 00:41:55 -0500
changeset 3314 ecc1bf27378c
parent 2904 8ca608c1eb02
permissions -rw-r--r--
merge: unify merge and copy actions

% 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