Merge branch 'jc/merge-x-theirs-docfix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:57 +0000 (14:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:57 +0000 (14:47 +0900)
commit4da3e23...f5a3989328c4dc8368cf5906f8679b30
tree23d86e9...dcd61fc73422c9efc8e35eb8c959d3b3copy hash to clipboard (tree)
parent47d26f0...66de017d7516e3414517eb5898f3723fcopy hash to clipboard (diff)
parentc25d98b...a730cbc63033ba3360df2519d43a40cdcopy hash to clipboard (diff)