mergetools / gvimdiff2on commit Merge branch 'ds/rev-parse-required-args' into maint (c7b3173)
   1. "$MERGE_TOOLS_DIR/vimdiff"