Andrew's git / gitweb.git / diff
?
rerere: add documentation for conflict normalization
authorThomas Gummerer <t.gummerer@gmail.com>
Sun, 5 Aug 2018 17:20:31 +0000 (18:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2018 20:22:34 +0000 (13:22 -0700)
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>
No differences found