12 Commits

Author	SHA1	Message	Date
Pirate Praveen	c25aa7cd82	New upstream version 1.3.0+dfsg.1	2021-12-10 16:42:08 +05:30
Jongmin Kim	ac3d33df5d	New upstream version 0.28.1+dfsg.1	2019-05-12 00:29:21 +09:00
Vicent Marti	b656e5eb4f	merge: Fix memory leak in test	2015-11-02 13:47:04 +01:00
Vicent Marti	85196232e8	Add test case	2015-11-02 13:47:04 +01:00
Edward Thomson	4b1b2bd9eb	revwalk::mergebase test: free memory	2014-10-26 22:27:58 -04:00
Arthur Schreiber	eca07bcd83	Add git_merge_bases_many.	2014-10-09 14:19:00 +02:00
Vicent Marti	46a13f3247	Merge pull request #2481 from libgit2/cmn/oidarray ... merge: expose multiple merge bases	2014-08-29 18:19:56 +02:00
Carlos Martín Nieto	e07aebb4e2	Fix ahead-behind tests ... The logic was reversed. I have checked manually each pair with git and adjusted the expectation to what git status prints.	2014-08-28 13:34:42 +02:00
Carlos Martín Nieto	7db0e6ee48	merge: expose multiple merge bases ... We always calculate multiple merge bases, but up to now we had only exposed the "best" merge base. Introduce git_oidarray which analogously to git_strarray lets us return multiple ids.	2014-07-27 17:17:22 +02:00
Edward Thomson	0cee70ebb7	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
Aimeast	0aee025bef	Implement git_merge_base_octopus	2014-03-18 22:31:14 +08:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00