Merge branch 'jk/delete-modechange-conflict' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Nov 2015 20:18:11 +0000 (12:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Nov 2015 20:18:11 +0000 (12:18 -0800)
commit5e6154f...145d66af36e10ef4db7e1d1e9502c501
tree98e62ba...a698d6a4ed266b98e9a95bc5fe1b1c1acopy hash to clipboard (tree)
parentc378862...1ec23dd526e318b4c1bfbf826f8dd6b6copy hash to clipboard (diff)
parent72fac66...ca302dbecbe42dfa0ddc7e42db2fe567copy hash to clipboard (diff)
merge-recursive.c