diff options
| author |  Thomas Gummerer <t.gummerer@gmail.com> | 2018-08-28 22:27:43 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-29 08:54:11 -0700 |
| commit | bc4caecf9557c765951897d8483b1514ebae74bf (patch) | |
| tree | ff832043b7ca4966267cbc0ded3ebddd727eae12 /khash.h | |
| parent | rerere: recalculate conflict ID when unresolved conflict is committed (diff) | |
| download | tgif-bc4caecf9557c765951897d8483b1514ebae74bf.tar.xz | |
rerere: mention caveat about unmatched conflict markers
4af3220 ("rerere: teach rerere to handle nested conflicts",
2018-08-05) introduced slightly better behaviour if the user commits
conflict markers and then gets another conflict in 'git rerere'.
However this is just a heuristic to punt on such conflicts better, and
doesn't deal with any unmatched conflict markers. Make that clearer
in the documentation.
Suggested-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 'khash.h')
0 files changed, 0 insertions, 0 deletions