From: Thomas Gummerer <t.gummerer@gmail.com>
Date: Sun, 5 Aug 2018 17:20:31 +0000 (+0100)
Subject: rerere: add documentation for conflict normalization
X-Git-Tag: v2.20.0-rc0~248^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fb90dca34c498ac1f922d579c202b4723e87455a?ds=inline;hp=fb90dca34c498ac1f922d579c202b4723e87455a

rerere: add documentation for conflict normalization

Add some documentation for the logic behind the conflict normalization
in rerere.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---