mergetools / gvimdiff2on commit Merge branch 'jk/pending-keep-tag-name' (7195733)
   1. "$MERGE_TOOLS_DIR/vimdiff"