Merge branch 'da/difftool' into maint

diff --git a/path.c b/path.c
index bbaea5ab0bf73056dfa74063474f62685fda1d5e..503766784c4c0c1be71edacbaae6ec4bd698ee8d 100644 (file)
--- a/path.c
+++ b/path.c
@@ -134,7 +134,7 @@ static struct common_dir common_list[] = {
  * definite
  * definition
  *
- * The trie would look look like:
+ * The trie would look like:
  * root: len = 0, children a and d non-NULL, value = NULL.
  *    a: len = 2, contents = bc, value = (data for "abc")
  *    d: len = 2, contents = ef, children i non-NULL, value = (data for "def")