Merge branch 'js/xmerge-marker-eol'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:06 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:06 +0000 (14:20 -0800)
commit81ad6a9...538bdbc24754cab577d8e480a8c5d012
tree5943184...aa8d7dab7f6d925a0e6b9c23369585f9copy hash to clipboard (tree)
parentd0a1cbc...ab54d828be2d83acc73f38c162962966copy hash to clipboard (diff)
parent15980de...b9f41324aba5cc9536e463d204bafe63copy hash to clipboard (diff)