transport-helper: mismerge fix

diff --git a/convert.h b/convert.h
index ec5fd69430908915cf9c0de62a2021882fd2c658..0c2143c152734feb3bdc7ba44b61b8327f02881c 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -48,7 +48,7 @@ static inline int would_convert_to_git(const char *path, const char *src,
 
 /*****************************************************************
  *
- * Streaming converison support
+ * Streaming conversion support
  *
  *****************************************************************/