mergetools / gvimdiff2on commit Merge branch 'et/add-chmod-x' (c49fd57)
   1. "$MERGE_TOOLS_DIR/vimdiff"