jgit.git - JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit

	Commit message (Expand)	Author	Age	Files	Lines
*	Rename RecursiveMergerTest and ResolveMergerTest to reduce confusion	David Pursehouse	2018-03-24	1	-897/+0
*	RecursiveMergerTest: Open FileOutputStream in try-with-resource	David Pursehouse	2018-02-26	1	-33/+28
*	Enable and fix warnings about redundant specification of type arguments	David Pursehouse	2017-02-20	1	-3/+3
*	RecursiveMergerTest: Open TreeWalk and BufferedReader in try-with-resource	David Pursehouse	2016-02-12	1	-15/+14
*	Access static member LocalDiskRepositoryTestCase.CONTENT directly	Matthias Sohn	2015-07-14	1	-6/+7
*	Fix RecursiveMerger in case of multiple, independent base commits	Christian Halstrick	2015-03-25	1	-0/+63
*	RecursiveMerger should not fail on content-merge conflicts of parents	Christian Halstrick	2014-07-28	1	-0/+83
*	Fix RecursiveMerger's internal use of merge to find a merge base	Christian Halstrick	2014-07-25	1	-1/+179
*	JGit 3.0: move internal classes into an internal subpackage	Shawn Pearce	2013-03-18	1	-1/+1
*	Implement recursive merge strategy	George C. Young	2013-02-22	1	-0/+578