tests/test-mq-qdiff.out
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Tue, 10 Oct 2006 21:03:24 +0300
changeset 3351 50a18815e3f0
parent 2904 8ca608c1eb02
permissions -rw-r--r--
Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:

% 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