From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Jul 2015 02:36:24 +0000 (-0700)
Subject: rerere: refactor "replay" part of do_plain_rerere()
X-Git-Tag: v2.7.0-rc0~149^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8e7768b2de8bfdf82cde565d2f42e8d7f91e74e0?hp=8e7768b2de8bfdf82cde565d2f42e8d7f91e74e0

rerere: refactor "replay" part of do_plain_rerere()

Extract the body of a loop that attempts to replay recorded
resolution for each conflicted path into a helper function, not
because I want to call it from multiple places later, but because
the logic has become too deeply nested and hard to read.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---