tests/test-mq-qdiff.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 06 Feb 2007 15:54:58 -0200
changeset 4065 8ee983e3d461
parent 2904 8ca608c1eb02
permissions -rw-r--r--
fix strip'ping the second parent of a merge

% 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