maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge(3p/git): Merge git upstream at v2.26.2

Browse source
This commit is contained in:
Vincent Ambo 2020-05-22 17:46:45 +01:00
commit 5229c9b232
1006 changed files with 149006 additions and 60819 deletions
Download patch file Download diff file Expand all files Collapse all files

2
third_party/git/t/t9809-git-p4-client-view.sh vendored
View file

@ -407,7 +407,7 @@ test_expect_success 'reinit depot' '
'
#
# What happens when two files of the same name are overlayed together?
# What happens when two files of the same name are overlaid together?
# The last-listed file should take preference.
#
# //depot