Merge branch 'dw/mergetool-vim-window-shuffle'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:13:34 +0000 (10:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:13:34 +0000 (10:13 -0800)
commit82c17b7...9ae1c78ce4891ad272f78fd2cd181ded
tree80fc197...62f73001fc213011474369dbe0a39708copy hash to clipboard (tree)
parentd6a5088...6744e0fe19ed1a43700f400b334705f4copy hash to clipboard (diff)
parent2300328...b209762a14e32525cfaa91778681f059copy hash to clipboard (diff)