mergetools / vimdiff2on commit Merge branch 'jk/alloc-commit-id' (10b944b)
   1. "$MERGE_TOOLS_DIR/vimdiff"