Merge branch 'dw/mergetool-vim-window-shuffle' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:19 +0000 (13:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:20 +0000 (13:10 -0800)
commit2263a05...07a1dd8d402790b578573238ab2abd9a
tree7ea09a1...8a9654ce0e1869a44f6670913b640291copy hash to clipboard (tree)
parentfa7b63d...f142bec8fe0568761e1c9c22ec877bcacopy hash to clipboard (diff)
parent2300328...b209762a14e32525cfaa91778681f059copy hash to clipboard (diff)