From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2019 18:30:23 +0000 (-0700)
Subject: Merge branch 'ea/merge-code-cleanup'
X-Git-Tag: v2.23.0-rc0~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dd0bc5b531f47e54d499e944db5276505319eaef

Merge branch 'ea/merge-code-cleanup'

A loop has been rewritten for conciseness and clarity.

* ea/merge-code-cleanup:
builtin/merge.c - cleanup of code in for-cycle that tests strategies
---

dd0bc5b531f47e54d499e944db5276505319eaef