6 Commits

Author	SHA1	Message	Date
Utkarsh Gupta	0c9c969a9b	New upstream version 0.99.0+dfsg.1	2020-03-14 00:52:48 +05:30
Jongmin Kim	ac3d33df5d	New upstream version 0.28.1+dfsg.1	2019-05-12 00:29:21 +09:00
Edward Thomson	49806e9bc4	merge_trees: introduce test for submodule renames ... Test that shows that submodules are incorrectly considered in renames, and `git_merge_trees` will fail to lookup the submodule as a blob.	2017-02-09 18:13:06 +00:00
Edward Thomson	19ed4d0ca3	merge: set default rename threshold ... When `GIT_MERGE_FIND_RENAMES` is set, provide a default for `rename_threshold` when it is unset.	2017-01-01 22:34:43 +00:00
Edward Thomson	5aa2ac6de1	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00