Andrew's git / gitweb.git / diff
?
Merge branch 'dp/merge-strategy-doc-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 21:22:47 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 21:22:47 +0000 (14:22 -0700)
Doc fix.

* dp/merge-strategy-doc-fix:
Documentation/merge-strategies: typofix

1  2 
Documentation/merge-strategies.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/merge-strategies.txt
Simple merge