mergetools / gvimdiff2on commit Merge branch 'ds/commit-graph-lockfile-fix' (a856e7d)
   1. "$MERGE_TOOLS_DIR/vimdiff"