rerere: teach rerere to handle nested conflicts
authorThomas Gummerer <t.gummerer@gmail.com>
Sun, 5 Aug 2018 17:20:36 +0000 (18:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2018 20:22:35 +0000 (13:22 -0700)
commit4af3220...bc106412a456791037fc4a402101fbb4
treeac14ac6...1e9e350f003e6ed6c981cb918b12c0c8copy hash to clipboard (tree)
parent5ebbdad...447ccaaf5af18a5f4f8f5065bd9fff3dcopy hash to clipboard (diff)
Documentation/technical/rerere.txt
rerere.c
t/t4200-rerere.sh