mergetools / gvimdiff3on commit mark_complete(): rewrite to take an object_id argument (b4ebaf9)
   1. "$MERGE_TOOLS_DIR/vimdiff"