diff options
| author | Elijah Newren <newren@gmail.com> | 2018-06-09 21:16:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-12 10:22:57 -0700 |
| commit | 9366536583a101b4e02c2cd047c03d91dc62827d (patch) | |
| tree | 712d9dfc9f89b19729d746df8f64178020c7709a /merge-recursive.c | |
| parent | d90e759fd5d8c30ab37ecccbaa3a00c85682eaf9 (diff) | |
| download | git-9366536583a101b4e02c2cd047c03d91dc62827d.tar.gz git-9366536583a101b4e02c2cd047c03d91dc62827d.tar.xz | |
merge-recursive: align labels with their respective code blocks
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 09c249b93..553803817 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); |