hex: introduce functions to print arbitrary hashes

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 45a163c5556d0a40767f8d9fc5fd32ff86a514d6..fa87341e678ba5908963e7b2795970c6bac5dcf7 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2240,7 +2240,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';