mergetools / vimdiff2on commit Merge branch 'bc/object-id' into base (ff08e56)
   1. "$MERGE_TOOLS_DIR/vimdiff"