mergetools / gvimdiff2on commit Merge branch 'bc/object-id' (b1081e4)
   1. "$MERGE_TOOLS_DIR/vimdiff"