mergetools / gvimdiff2on commit Merge branch 'ys/bisect-object-id-missing-conversion-fix' (aa1c2b6)
   1. "$MERGE_TOOLS_DIR/vimdiff"