view tests/test-mq-qdiff.out @ 5552:edfbbb225653

Merge with mpm.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 26 Nov 2007 12:25:55 -0800
parents 8ca608c1eb02
children 3d1f9dcecdea
line wrap: on
line source

% 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