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>
Elijah Newren committed
Jun 9, 2018 at 21:16 UTC
9366536583a101b4e02c2cd047c03d91dc62827d
1 file changed
+3
-3
merge-recursive.c
+3
-3
@@ -998,10 +998,10 @@ static int update_file_flags(struct merge_options *o,
998
ret = err(o,
999
_("do not know what to do with %06o %s '%s'"),
1000
mode, oid_to_hex(oid), path);
1001
- free_buf:
1001
+ free_buf:
1002
free(buf);
1003
}
1004
- update_index:
1004
+update_index:
1005
if (!ret && update_cache)
1006
if (add_cacheinfo(o, mode, oid, path, 0, update_wd,
1007
ADD_CACHE_OK_TO_ADD))
@@ -3326,7 +3326,7 @@ int merge_trees(struct merge_options *o,
3326
entries->items[i].string);
3327
}
3328
3329
-cleanup:
3329
+ cleanup:
3330
final_cleanup_renames(&re_info);
3331
3332
string_list_clear(entries, 1);