Merge branch 'dp/merge-strategy-doc-fix'
Doc fix. * dp/merge-strategy-doc-fix: Documentation/merge-strategies: typofix
Junio C Hamano committed
Mar 21, 2018 at 11:30 UTC
e2a37ec2b03456bc9131f7c1fe68e1742bf28953
No changes.