mergetools / vimdiff2on commit Merge branch 'jk/robustify-parse-commit' (5bb6205)
   1. "$MERGE_TOOLS_DIR/vimdiff"