Merge branch 'fa/merge-recursive-no-rename'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2016 21:37:25 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2016 21:37:25 +0000 (13:37 -0800)
commit4ce064d...813279109a4003dee8c8b63077ab473d
treec9ee630...4543b9a0a6a116756c0d0b5d6f5c1847copy hash to clipboard (tree)
parent9671a76...174d9bd2b4f56243526fda51f9ff8e46copy hash to clipboard (diff)
parent44c74ec...de186d7c7047642840d581709db3ba23copy hash to clipboard (diff)