mergetools / gvimdiff2on commit Merge branch 'lf/bundle-with-tip-wo-message' (e1a3f17)
   1. "$MERGE_TOOLS_DIR/vimdiff"