# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1351563924 18000
#      Mon Oct 29 21:25:24 2012 -0500
# Node ID 92aa31a3a1ddc92ebdaf2f2ce026cfd67fe533c4
# Parent  b933b2b06b8702da4b0626fc7e73fd8b5137ca76
test-pull.t: normalize git-merge output

diff --git a/tests/test-pull.t b/tests/test-pull.t
--- 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 ..