From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Aug 2018 20:09:55 +0000 (-0700)
Subject: Merge branch 'jk/merge-subtree-heuristics'
X-Git-Tag: v2.19.0-rc0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60858f343aa909305c28790c7684bf88905695a2;p=thirdparty%2Fgit.git

Merge branch 'jk/merge-subtree-heuristics'

The automatic tree-matching in "git merge -s subtree" was broken 5
years ago and nobody has noticed since then, which is now fixed.

* jk/merge-subtree-heuristics:
  score_trees(): fix iteration over trees with missing entries
---

60858f343aa909305c28790c7684bf88905695a2