Merge branch 'du/rev-parse-is-plumbing' into maint

diff --git a/merge-recursive.c b/merge-recursive.c
index e5243dbc542d786a645a9c038c855a6ca30acaba..1b5c25591814e5a7e30a78f1bece849a3fc3996e 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2239,7 +2239,7 @@ static struct dir_rename_entry *check_dir_renamed(const char *path,
 {
        char *temp = xstrdup(path);
        char *end;
-       struct dir_rename_entry *entry = NULL;;
+       struct dir_rename_entry *entry = NULL;
 
        while ((end = strrchr(temp, '/'))) {
                *end = '\0';