aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java
Commit message (Expand)AuthorAgeFilesLines
* Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-151-1/+1
* Support creating Mergers without a RepositoryDave Borowitz2017-04-051-0/+30
* Revert "CommitBuilder should check for duplicate parents"Jonathan Nieder2015-03-181-108/+0
* CommitBuilder should check for duplicate parentsChristian Halstrick2015-03-121-0/+108
* Move SampleDataRepositoryTestCase to org.eclipse.jgit.testShawn Pearce2013-11-241-1/+1
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-041-1/+1
* Declare essentially static methods as staticRobin Rosenberg2012-12-271-2/+3
* Pull up method for creating DirCacheEntry into RepositoryTestCaseRobin Stocker2012-10-281-52/+35
* Remove deprecated Repository.mapTreeShawn O. Pearce2011-03-071-3/+3
* Convert all JGit unit tests to JUnit 4Robin Rosenberg2010-12-311-0/+17
* Move commit and tag formatting to CommitBuilder, TagBuilderShawn O. Pearce2010-08-231-2/+1
* Rename Commit, Tag to CommitBuilder, TagBuilderShawn O. Pearce2010-08-231-2/+2
* Make Commit class only for writingShawn O. Pearce2010-08-201-1/+1
* Move DirCache factory methods to RepositoryShawn O. Pearce2010-06-301-21/+21
* Start using ObjectInserter instead of ObjectWriterShawn O. Pearce2010-06-251-15/+18
* Only import the sample data packs on tests that need themShawn O. Pearce2009-11-021-2/+2
* Initial JGit contribution to eclipse.orgGit Development Community2009-09-291-0/+391