rerere: factor out handle_conflict function
authorThomas Gummerer <t.gummerer@gmail.com>
Sun, 5 Aug 2018 17:20:34 +0000 (18:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2018 20:22:35 +0000 (13:22 -0700)
commitc0f16f8...14432b9b6a1b21885080eab6388d887e
treed665d09...cfc5f26595c790b3eeeb1d6ba102c461copy hash to clipboard (tree)
parent221444f...d11a8fac84514447c2902430e237759ccopy hash to clipboard (diff)
rerere.c