Skip to content
Snippets Groups Projects
Commit 92aa31a3 authored by durin42's avatar durin42
Browse files

test-pull.t: normalize git-merge output

parent b933b2b0
No related branches found
No related tags found
No related merge requests found
......@@ -118,5 +118,5 @@
add a merge to the git repo
$ cd gitrepo
$ git merge beta
$ git merge beta | sed 's/| */| /'
Merge made by the 'recursive' strategy.
......@@ -122,5 +122,5 @@
Merge made by the 'recursive' strategy.
beta | 1 +
beta | 1 +
1 file changed, 1 insertion(+)
create mode 100644 beta
$ cd ..
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment