These are to clean up some odd code and in-code comment that invited "Huh?" while I was reviewing the code paths involved in "git rerere" recently. None of them is intended to change any behaviour. Junio C Hamano (4): rerere: simplify check_one_conflict() helper function rerere: fix comment on handle_file() helper rerere: try_merge() should use LL_MERGE_ERROR when it means an error rerere: modernize use of empty strbuf rerere.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) -- 2.42.0-29-gcd9da15a85
