Commits

Augie Fackler committed 92aa31a

test-pull.t: normalize git-merge output

Comments (0)

Files changed (1)

   
 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. David Carr

    Now that we're using the unified format, I think that this could have been done using either glob or regular expression filtering. Do you prefer sed over those, or is it just a matter of habit?

    1 file changed, 1 insertion(+)
    create mode 100644 beta
   $ cd ..