mergetools / gvimdiff3on commit Merge branch 'rs/http-push-cleanup' (bbde4a9)
   1. "$MERGE_TOOLS_DIR/vimdiff"