mergetools / vimdiff2on commit Merge branch 'jk/http-push-symref-fix' (ea6e82c)
   1. "$MERGE_TOOLS_DIR/vimdiff"