From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2018 20:53:51 +0000 (-0700)
Subject: Merge branch 'tg/rerere'
X-Git-Tag: v2.20.0-rc0~248
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/39006893f9fce70d8d2fe055e4285e1fca0ca050

Merge branch 'tg/rerere'

Fixes to "git rerere" corner cases, especially when conflict
markers cannot be parsed in the file.

* tg/rerere:
rerere: recalculate conflict ID when unresolved conflict is committed
rerere: teach rerere to handle nested conflicts
rerere: return strbuf from handle path
rerere: factor out handle_conflict function
rerere: only return whether a path has conflicts or not
rerere: fix crash with files rerere can't handle
rerere: add documentation for conflict normalization
rerere: mark strings for translation
rerere: wrap paths in output in sq
rerere: lowercase error messages
rerere: unify error messages when read_cache fails
---

39006893f9fce70d8d2fe055e4285e1fca0ca050