git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3d7a52 8777616)
Merge branch 'an/merge-single-strategy-optim'
authorJunio C Hamano <redacted>
Tue, 2 Jun 2020 20:35:01 +0000 (13:35 -0700)
committerJunio C Hamano <redacted>
Tue, 2 Jun 2020 20:35:01 +0000 (13:35 -0700)
Code optimization for a common case.

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

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
git clone https://git.99rst.org/PROJECT