diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-30 19:36:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 16:02:37 -0700 |
| commit | 8e7768b2de8bfdf82cde565d2f42e8d7f91e74e0 (patch) | |
| tree | 5b237bf896f50cf904f1cae366f3bf5173ab78d5 /streaming.c | |
| parent | e828de826bd0b852337b9625354c7c73d8de20c0 (diff) | |
| download | git-8e7768b2de8bfdf82cde565d2f42e8d7f91e74e0.tar.gz git-8e7768b2de8bfdf82cde565d2f42e8d7f91e74e0.tar.xz | |
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>
Diffstat (limited to 'streaming.c')
0 files changed, 0 insertions, 0 deletions