Merge branch 'jc/apply-fix-mismerge' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:59 +0000 (10:20 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:59 +0000 (10:20 +0900)
commit34a75cc...1dade147f404c0841c3f1ec777c0a97a
tree510b420...b094401461673c76cf4117cfa2f31b74copy hash to clipboard (tree)
parent0501b7e...8564d11e87d228f7ffdbdb4b147145e3copy hash to clipboard (diff)
parente294e89...9fea043225a023f981121540b14b08cdcopy hash to clipboard (diff)
apply.c