]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ea/merge-code-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:23 +0000 (11:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:23 +0000 (11:30 -0700)
commitdd0bc5b531f47e54d499e944db5276505319eaef
tree0574c30d44aebf3934f509c17626f27ca29f6c56
parent7b098429355bb3271f9ffdf73b97f2ef82794fea
parentf00abe6ae05ac67aa3a22469a1d8f84defd1df6c
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