From: Junio C Hamano <redacted>
Date: Tue, 2 Jun 2020 20:35:01 +0000 (-0700)
Subject: Merge branch 'an/merge-single-strategy-optim'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0739479c6a2b02992037d7e816663d6782bfcd49;p=git.git

Merge branch 'an/merge-single-strategy-optim'

Code optimization for a common case.

* an/merge-single-strategy-optim:
  merge: optimization to skip evaluate_result for single strategy
---

0739479c6a2b02992037d7e816663d6782bfcd49