summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-09-05 17:03:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-05 17:21:24 (GMT)
commitc3b9bc94b9bee431323856fe2c373312c60969d7 (patch)
treecb6907f9c9c2c5085df4522144f11d99809ec2c9 /merge-recursive.c
parent53f9a3e157dbbc901a02ac2c73346d375e24978c (diff)
downloadgit-c3b9bc94b9bee431323856fe2c373312c60969d7.zip
git-c3b9bc94b9bee431323856fe2c373312c60969d7.tar.gz
git-c3b9bc94b9bee431323856fe2c373312c60969d7.tar.bz2
Remove superfluous trailing semicolons
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index f110e1c..aec985d 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2213,7 +2213,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';