Merge branch 'jc/merge-x-theirs-docfix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:03 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:03 +0000 (14:19 +0900)
commit77cdf8c...f9d142a8d9693531d442ffa0712874d6
tree33fb9d8...9abc6a46aa02ab25778573cef23d2e4ccopy hash to clipboard (tree)
parent01ae81e...28f35fedac97e6e44336305786c3f14ccopy hash to clipboard (diff)
parentc25d98b...a730cbc63033ba3360df2519d43a40cdcopy hash to clipboard (diff)