mergetools / gvimdiff3on commit Merge branch 'rj/add-chmod-error-message' (a75ef3f)
   1. "$MERGE_TOOLS_DIR/vimdiff"