aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
Commit message (Expand)AuthorAgeFilesLines
* A folder does not constitute a dirty work treeRobin Rosenberg2013-03-101-0/+77
* Implement recursive merge strategyGeorge C. Young2013-02-221-0/+66
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-041-1/+1
* Refactor ResolveMergerTest to allow testing multiple strategiesChristian Halstrick2012-10-251-35/+67
* 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