rerere: recalculate conflict ID when unresolved conflict is committed
authorThomas Gummerer <t.gummerer@gmail.com>
Sun, 5 Aug 2018 17:20:37 +0000 (18:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2018 20:22:35 +0000 (13:22 -0700)
commitbd7dfa5...3e0263858071b8648a55ef7ccae1085b
tree48eb73c...e91fdeed8cc586f3fc89c44c41926a80copy hash to clipboard (tree)
parent4af3220...bc106412a456791037fc4a402101fbb4copy hash to clipboard (diff)
rerere.c
t/t4200-rerere.sh