mergetools / gvimdiff3on commit Merge branch 'tg/tag-state-tag-name-in-editor-hints' (43eb7cb)
   1. "$MERGE_TOOLS_DIR/vimdiff"