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 /rerere.c | |
| parent | 2373b6505966244ab3f5b630680169692d28f6f6 (diff) | |
| download | git-fb90dca34c498ac1f922d579c202b4723e87455a.tar.gz git-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 'rerere.c')
| -rw-r--r-- | rerere.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -394,10 +394,6 @@ static int is_cmarker(char *buf, int marker_char, int marker_size) * and NUL concatenated together. * * Return the number of conflict hunks found. - * - * NEEDSWORK: the logic and theory of operation behind this conflict - * normalization may deserve to be documented somewhere, perhaps in - * Documentation/technical/rerere.txt. */ static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_size) { |