git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b09842 f00abe6)
Merge branch 'ea/merge-code-cleanup'
authorJunio C Hamano <redacted>
Fri, 19 Jul 2019 18:30:23 +0000 (11:30 -0700)
committerJunio C Hamano <redacted>
Fri, 19 Jul 2019 18:30:23 +0000 (11:30 -0700)
commitdd0bc5b531f47e54d499e944db5276505319eaef
tree0574c30d44aebf3934f509c17626f27ca29f6c56tree | snapshot
parent7b098429355bb3271f9ffdf73b97f2ef82794feacommit | diff
parentf00abe6ae05ac67aa3a22469a1d8f84defd1df6ccommit | diff
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
builtin/merge.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT