git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-05 17:40:24 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
5c9bdfeeada771fd7ef9b2c8fa082d1f22eccc19
git/match-trees.c
Junio C Hamano 60858f343a 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
2018-08-17 13:09:55 -07:00

8.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink