mergetools / vimdiff2on commit Merge branch 'bc/object-id' (4af9a7d)
   1. "$MERGE_TOOLS_DIR/vimdiff"