mergetools / gvimdiff3on commit builtin/rev-parse: rewrite to take an object_id argument (e23b036)
   1. "$MERGE_TOOLS_DIR/vimdiff"