mergetools / gvimdiff2on commit Merge branch 'jc/push-follow-tag' (55f6fbe)
   1. "$MERGE_TOOLS_DIR/vimdiff"