undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: align labels with their respective code blocks

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-06-09 21:16:13 -07:00 committed by Junio C Hamano
parent d90e759fd5
commit 9366536583
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.c
View File

@ -998,10 +998,10 @@ static int update_file_flags(struct merge_options *o,
ret = err(o,
_("do not know what to do with %06o %s '%s'"),
mode, oid_to_hex(oid), path);
free_buf:
free_buf:
free(buf);
}
update_index:
update_index:
if (!ret && update_cache)
if (add_cacheinfo(o, mode, oid, path, 0, update_wd,
ADD_CACHE_OK_TO_ADD))
@ -3326,7 +3326,7 @@ int merge_trees(struct merge_options *o,
entries->items[i].string);
}
cleanup:
cleanup:
final_cleanup_renames(&re_info);
string_list_clear(entries, 1);