Mercurial > hg

diff tests/test-mq-merge.t @ 22521:3f948469bac0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: write '# Parent ' lines with two spaces like export does (BC) This aligns "Parent" node IDs with "Node ID" node IDs.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 24 Sep 2014 01:36:44 +0200
parents 9d4ebb75de53
children e955549cd045
line wrap: on
line diff
--- a/tests/test-mq-merge.t	Sat Sep 20 17:06:56 2014 +0200
+++ b/tests/test-mq-merge.t	Wed Sep 24 01:36:44 2014 +0200
@@ -138,7 +138,7 @@
 
   $ cat .hg/patches/patcha
   # HG changeset patch
-  # Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4
+  # Parent  d3873e73d99ef67873dac33fbcc66268d5d2b6f4
   
   diff --git a/a b/a
   --- a/a
@@ -161,7 +161,7 @@
   $ cat .hg/patches/patcha2
   # HG changeset patch
   # Date 0 0
-  # Parent ???????????????????????????????????????? (glob)
+  # Parent  ???????????????????????????????????????? (glob)
   
   diff -r ???????????? -r ???????????? a (glob)
   --- a/a