diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:47 -0700 |
| commit | ae109a9789da452192588b517f893f6bda6383e6 (patch) | |
| tree | fa0bfe3be065bcf20fe1671effadc57ba0aab23e /merge-recursive.c | |
| parent | 48a81ed29795da3e4cc40d4e5ea535878e4f2d9f (diff) | |
| parent | c3b9bc94b9bee431323856fe2c373312c60969d7 (diff) | |
| download | git-ae109a9789da452192588b517f893f6bda6383e6.tar.gz git-ae109a9789da452192588b517f893f6bda6383e6.tar.xz | |
Merge branch 'en/double-semicolon-fix'
Code clean-up.
* en/double-semicolon-fix:
Remove superfluous trailing semicolons
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 45a163c55..fa87341e6 100644 --- 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'; |