Mercurial > hg > hg-git

changeset 569:92aa31a3a1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-pull.t: normalize git-merge output
author Augie Fackler <raf@durin42.com>
date Mon, 29 Oct 2012 21:25:24 -0500
parents b933b2b06b87
children a24c2f90a3dd
files tests/test-pull.t
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -118,9 +118,9 @@
   
 add a merge to the git repo
   $ cd gitrepo
-  $ git merge beta
+  $ git merge beta | sed 's/|  */| /'
   Merge made by the 'recursive' strategy.
-   beta |    1 +
+   beta | 1 +
    1 file changed, 1 insertion(+)
    create mode 100644 beta
   $ cd ..