mergetools / gvimdiff2on commit Merge branch 'jc/bundle' (10a3638)
   1. "$MERGE_TOOLS_DIR/vimdiff"