Merge branch 'jk/refs-df-conflict'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Oct 2017 05:52:23 +0000 (14:52 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Oct 2017 05:52:23 +0000 (14:52 +0900)
commitbab02c6...63958fca62e197053f41affcd50bb00a
treee87f179...6bad89e57dac5e1a2fe8df0380e0dc5dcopy hash to clipboard (tree)
parent3d2a6dc...362ec974002f585c30efa51609da0bf4copy hash to clipboard (diff)
parenta1c1d81...0dbc4a108dd2c05d2f93049d49e61328copy hash to clipboard (diff)