Mercurial > hg-stable

view tests/test-mq-qdiff.out @ 6385:0d4e068e9e52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 24 Mar 2008 15:36:56 -0700
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