rerere: mention caveat about unmatched conflict markers
authorThomas Gummerer <t.gummerer@gmail.com>
Tue, 28 Aug 2018 21:27:43 +0000 (22:27 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2018 15:54:11 +0000 (08:54 -0700)
commitbc4caec...9557c765951897d8483b1514ebae74bf
treeff83204...b7ca4966267cbc0ded3ebddd727eae12copy hash to clipboard (tree)
parentbd7dfa5...3e0263858071b8648a55ef7ccae1085bcopy hash to clipboard (diff)
Documentation/technical/rerere.txt