Merge branch 'da/difftool' into maint

diff --git a/transport-helper.c b/transport-helper.c
index b934183236ca571093f55818f5018c278150e274..13b7a57a759c8f15d92cd3f61e22cdd0010db570 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1152,7 +1152,7 @@ static void udt_close_if_finished(struct unidirectional_transfer *t)
 }
 
 /*
- * Tries to read read data from source into buffer. If buffer is full,
+ * Tries to read data from source into buffer. If buffer is full,
  * no data is read. Returns 0 on success, -1 on error.
  */
 static int udt_do_read(struct unidirectional_transfer *t)