mergetools / gvimdiff2on commit Merge branch 'nd/doc-new-command' into maint (dcfb9d7)
   1. "$MERGE_TOOLS_DIR/vimdiff"