git/Documentation
Thomas Gummerer fb90dca34c 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>
2018-08-06 13:22:34 -07:00
..
2018-06-28 12:55:47 -07:00
2018-06-25 13:22:36 -07:00
2018-05-23 14:38:22 +09:00
2018-05-23 14:38:22 +09:00
2018-06-18 10:18:41 -07:00
2016-08-11 14:35:42 -07:00
2017-06-27 10:35:49 -07:00
2018-06-01 15:06:37 +09:00
2018-04-18 12:49:26 +09:00