Thomas Gummerer <t.gummerer@xxxxxxxxx> writes: > Thomas Gummerer (11): > rerere: unify error messages when read_cache fails > rerere: lowercase error messages > rerere: wrap paths in output in sq > rerere: mark strings for translation > rerere: add documentation for conflict normalization > rerere: fix crash when conflict goes unresolved > rerere: only return whether a path has conflicts or not > rerere: factor out handle_conflict function > rerere: return strbuf from handle path > rerere: teach rerere to handle nested conflicts > rerere: recalculate conflict ID when unresolved conflict is committed Even though I am not certain about the last two steps, everything before them looked trivially correct and good changes (well, the "strbuf" one's goodness obviously depends on the goodness of the last two, which are helped by it). Sorry for taking so long before getting to the series.
