mergetools / gvimdiff2on commit contrib/subtree: allow adding an annotated tag (6f1871f)
   1. "$MERGE_TOOLS_DIR/vimdiff"