From ebc4a036f85abe2eeaf161c4708c814074074025 Mon Sep 17 00:00:00 2001
From: Augie Fackler <raf@durin42.com>
Date: Mon, 29 Oct 2012 21:25:24 -0500
Subject: [PATCH] test-pull.t: normalize git-merge output

---
 tests/test-pull.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-pull.t b/tests/test-pull.t
index 74cdffdaaf..af6dbc99c0 100644
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -118,9 +118,9 @@ pull everything else
   
 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 ..