Merge branch 'wd/rebase-conflict-guide'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:26:58 +0000 (13:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:26:58 +0000 (13:26 -0700)
commit076eeec...bec1df628717733fb16df6161d5ef7e5
tree962df7a...b4d3334a5b7aba6c022feb2e06eb5a32copy hash to clipboard (tree)
parent12deaf6...d468c050eafc0033f96892409d7f6701copy hash to clipboard (diff)
parent5fdacc1...c7eb2a7b435d62d99b41f75f44f74de1copy hash to clipboard (diff)