Refactor to avoid future Vim merge conflicts - #1706

Refactor to avoid future Vim merge conflicts#1706

ychin merged 1 commit into

macvim-dev:mastermacvim-dev/macvim:masterfrom

ychin:refactor-reduce-vim-merge-conflictsychin/macvim:refactor-reduce-vim-merge-conflictsCopy head branch name to clipboard