Mercurial > hg

diff tests/test-mq-qdiff.out @ 10191:99d285ac5da4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: qdiff with the same diff options than qrefresh (issue1350) Specifically, if current patch is a git patch and mq.git=keep, diff in git mode.
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 Jan 2010 21:49:05 +0100
parents 24bc6e414610
children a84f14228b1d
line wrap: on
line diff
--- a/tests/test-mq-qdiff.out	Fri Jan 01 21:21:34 2010 +0100
+++ b/tests/test-mq-qdiff.out	Fri Jan 01 21:49:05 2010 +0100
@@ -103,3 +103,22 @@
  7
  8
  9
+% qdiff preserve existing git flag
+diff --git a/lines b/lines
+--- a/lines
++++ b/lines
+@@ -1,9 +1,12 @@
++
++
+ 1
+ 2
+ 3
+ 4
+-hello world
+-goodbye world
++hello  world
++     goodbye world
+ 7
+ 8
+ 9
++a