[git-merge] Fixes doc (see  #3)
Merge remote-tracking branch 'origin/master'
Remove executable bit
Change the type hint to OptionsResolverInterface