aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-281-0/+83
* Fix RecursiveMerger's internal use of merge to find a merge baseChristian Halstrick2014-07-251-1/+179
* Fix merge/cherry-picking in CRLF modeRobin Rosenberg2014-03-021-0/+32
* Failing to delete a directory with untracked content is actually okRobin Rosenberg2014-02-101-5/+4
* Move SampleDataRepositoryTestCase to org.eclipse.jgit.testShawn Pearce2013-11-243-3/+3
* JGit 3.0: move internal classes into an internal subpackageShawn Pearce2013-03-181-1/+1
* A folder does not constitute a dirty work treeRobin Rosenberg2013-03-101-0/+77
* Implement recursive merge strategyGeorge C. Young2013-02-222-0/+644
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-045-5/+5
* Add conflicts message before footerStefan Lay2013-01-191-0/+42
* Declare essentially static methods as staticRobin Rosenberg2012-12-272-4/+6
* Merge "Refactor ResolveMergerTest to allow testing multiple strategies"Chris Aniszczyk2012-10-301-35/+67
|\
| * Refactor ResolveMergerTest to allow testing multiple strategiesChristian Halstrick2012-10-251-35/+67
* | Pull up method for creating DirCacheEntry into RepositoryTestCaseRobin Stocker2012-10-282-82/+48
|/
* Add the intended file to avoid breakageRobin Rosenberg2012-09-251-1/+1
* cleanup: Prefer assertEquals over assertTrue(....equals(...))Robin Rosenberg2012-09-031-5/+5
* Again teach ResolveMerger to create more correct DirCacheEntry'sChristian Halstrick2012-07-261-0/+439
* Revert "Teach ResolveMerger to create more correct DirCacheEntry's"Shawn Pearce2012-07-241-177/+1
* Teach ResolveMerger to create more correct DirCacheEntry'sMarkus Duft2012-07-191-1/+177
* Don't return success on failing paths in ResolveMergerRobin Stocker2012-06-231-0/+98
* Add "--squash" option to MergeCommandTomasz Zarna2012-06-151-0/+89
* Adapt merge message to C Git for remote-tracking branchRobin Stocker2011-11-231-2/+2
* Optimize MergeAlgorithm if ours or theirs is emptyChristian Halstrick2011-05-171-1/+19
* Fix "into" part of merge message for HEADRobin Stocker2011-05-051-0/+9
* Remove deprecated Repository.mapTreeShawn O. Pearce2011-03-071-3/+3
* Don't print "into HEAD" when merging refs/heads/masterRobin Stocker2011-02-011-0/+10
* Implement a revert commandRobin Rosenberg2011-01-021-0/+58
* Convert all JGit unit tests to JUnit 4Robin Rosenberg2010-12-314-5/+55
* Change default diff algorithm to histogram and add testsChristian Halstrick2010-11-261-0/+19
* Make diff algorithm configurableChristian Halstrick2010-11-261-1/+1
* Format merge commit messages like C GitRobin Stocker2010-11-061-0/+155
* Fixed merge algorithm regarding adjacent modificationsChristian Halstrick2010-11-021-1/+13
* Cleaned up MergeAlgorithmTestChristian Halstrick2010-11-021-67/+47
* Fix Severe Bug in Merge AlgorithmChristian Halstrick2010-10-281-0/+11
* Refactor diff sequence APIShawn O. Pearce2010-09-061-1/+2
* Improve MergeAlgorithm to produce smaller conflictsChristian Halstrick2010-08-311-2/+13
* Move commit and tag formatting to CommitBuilder, TagBuilderShawn O. Pearce2010-08-232-4/+2
* Rename Commit, Tag to CommitBuilder, TagBuilderShawn O. Pearce2010-08-232-4/+4
* Make Commit class only for writingShawn O. Pearce2010-08-202-2/+2
* Move DirCache factory methods to RepositoryShawn O. Pearce2010-06-302-25/+25
* Start using ObjectInserter instead of ObjectWriterShawn O. Pearce2010-06-252-24/+29
* Merge branch 'cq-diff'Shawn O. Pearce2010-01-061-0/+187
|\
| * Add file content merge algorithmChristian Halstrick2010-01-061-0/+187
* | 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-292-0/+547
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 09:17:38 +0000