Merge branch 'hu/cherry-pick-previous-branch'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"