mergetools / vimdiff2on commit rebase -i: replace reference to sha1 with oid (d80fc29)
   1. "$MERGE_TOOLS_DIR/vimdiff"