mergetools / vimdiff3on commit Merge branch 'ah/fix-http-push' (d9037ea)
   1. "$MERGE_TOOLS_DIR/vimdiff"