Mercurial > hg

diff tests/test-mq-merge.t @ 20306:fe8e254c7ad6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents 243ea5ffdf31
children 9d4ebb75de53
line wrap: on
line diff
--- a/tests/test-mq-merge.t	Wed Jan 01 21:46:45 2014 -0600
+++ b/tests/test-mq-merge.t	Tue Jan 21 14:30:06 2014 -0600
@@ -147,11 +147,13 @@
   -b
   +a
   +c
-  diff --git a/aa b/aa
-  new file mode 100644
-  --- /dev/null
+  diff --git a/a b/aa
+  copy from a
+  copy to aa
+  --- a/a
   +++ b/aa
-  @@ -0,0 +1,1 @@
+  @@ -1,1 +1,1 @@
+  -b
   +a
 
 Check patcha2 is still a regular patch: