projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b3d7a52 8777616)
Merge branch 'an/merge-single-strategy-optim'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2020 20:35:01 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2020 20:35:01 +0000 (13:35 -0700)
commit0739479c6a2b02992037d7e816663d6782bfcd49
tree544804f76037a2deeaa9520d4bbbef41225d13a0tree | snapshot
parentb3d7a52fac39193503a0b6728771d1bf6a161464commit | diff
parent8777616e4db2868609bc42a4c66cc69d23532dbccommit | diff
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
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.