Mercurial > hg

view tests/test-mq-qdiff.out @ 6011:15a53af36a89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: two fixes for kdiff3 example configuration
author Steve Borho <steve@borho.org>
date Sun, 03 Feb 2008 22:27:53 -0600
parents 3d1f9dcecdea
children 034f444902d9
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
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched