mergetools / gvimdiff2on commit Merge branch 'nd/init-relative-template-fix' into maint (35d7715)
   1. "$MERGE_TOOLS_DIR/vimdiff"