Merge branch 'jc/apply-fix-mismerge'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:59 +0000 (11:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:59 +0000 (11:51 +0900)
commitafc5f2c...63be2a51b1f87467065e47c398468c9e
tree5965af2...5aba72677949a6bde615a0934bf290b1copy hash to clipboard (tree)
parent5cea6ff...f20b99388821fa1bc279da06835f5a0ccopy hash to clipboard (diff)
parente294e89...9fea043225a023f981121540b14b08cdcopy hash to clipboard (diff)
apply.c