mergetools / gvimdiff3on commit Merge branch 'rs/get-tagged-oid' (cf861cd)
   1. "$MERGE_TOOLS_DIR/vimdiff"