mergetools / gvimdiff2on commit Merge branch 'jk/alloc-commit-id-maint' into maint (5d7c37a)
   1. "$MERGE_TOOLS_DIR/vimdiff"