mergetools / gvimdiff2on commit Merge branch 'rs/janitorial' into maint (dfb6759)
   1. "$MERGE_TOOLS_DIR/vimdiff"