mergetools / gvimdiff2on commit Merge branch 'dk/version-gen-gitdir' into maint (25b3e4f)
   1. "$MERGE_TOOLS_DIR/vimdiff"