facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
Code Issues Projects Releases Wiki Activity

test-pull.t: normalize git-merge output

Browse Source
This commit is contained in:
Augie Fackler 2012-10-29 21:25:24 -05:00
parent 7aba6f4536
commit ebc4a036f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test-pull.t
View File

@ -118,9 +118,9 @@ pull everything else
add a merge to the git repo add a merge to the git repo
$ cd gitrepo $ cd gitrepo
$ git merge beta $ git merge beta | sed 's/| */| /'
Merge made by the 'recursive' strategy. Merge made by the 'recursive' strategy.
beta | 1 + beta | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
create mode 100644 beta create mode 100644 beta
$ cd .. $ cd ..