mergetools / gvimdiff2on commit push: teach --force-with-lease to smart-http transport (05c1eb1)
   1. "$MERGE_TOOLS_DIR/vimdiff"