diff options
| author |  Thomas Gummerer <t.gummerer@gmail.com> | 2018-08-05 18:20:31 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-06 13:22:34 -0700 |
| commit | fb90dca34c498ac1f922d579c202b4723e87455a (patch) | |
| tree | 00ab0ad3129b666902709db3f82aeb47b43f25a8 /mergetools | |
| parent | rerere: mark strings for translation (diff) | |
| download | tgif-fb90dca34c498ac1f922d579c202b4723e87455a.tar.xz | |
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>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions