mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
test-pull.t: normalize git-merge output
This commit is contained in:
parent
7aba6f4536
commit
ebc4a036f8
@ -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 ..
|
||||
|
Loading…
Reference in New Issue
Block a user