mergetools / gvimdiff2on commit Merge branch 'ds/commit-graph-assert-missing-parents' (d01a3fa)
   1. "$MERGE_TOOLS_DIR/vimdiff"