From 9366536583a101b4e02c2cd047c03d91dc62827d Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sat, 9 Jun 2018 21:16:13 -0700 Subject: merge-recursive: align labels with their respective code blocks Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge-recursive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 09c249b93e..5538038178 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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); -- cgit v1.2.3