Merge branch 'js/xmerge-marker-eol' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:03:39 +0000 (10:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:03:39 +0000 (10:03 -0800)
commitab2c107...ab77a7879574992752a3ac96421bef34
treeeb32369...cedf7ce04545e0331b885dc17fa5e2abcopy hash to clipboard (tree)
parent527d4a6...8e330f4efe459442bbfb0799d29fd73acopy hash to clipboard (diff)
parent15980de...b9f41324aba5cc9536e463d204bafe63copy hash to clipboard (diff)