mergetools / gvimdiffon commit revision: rename add_pending_sha1 to add_pending_oid (a58a1b0)
   1. "$MERGE_TOOLS_DIR/vimdiff"