rerere: add note about files with existing conflict markers
authorThomas Gummerer <t.gummerer@gmail.com>
Tue, 28 Aug 2018 21:27:44 +0000 (22:27 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2018 16:03:29 +0000 (09:03 -0700)
commitf427869...de759e32c30e8ba7a4b20837d3806642
treebe2af8c...4ed90d7bb7c94e2e5f3478fa05bc2e62copy hash to clipboard (tree)
parentbc4caec...9557c765951897d8483b1514ebae74bfcopy hash to clipboard (diff)
Documentation/git-rerere.txt