| Commit message (Expand) | Author | Age | Files | Lines |
* | A folder does not constitute a dirty work tree | Robin Rosenberg | 2013-03-10 | 1 | -0/+77 |
* | Implement recursive merge strategy | George C. Young | 2013-02-22 | 1 | -0/+66 |
* | Move base test classes to the junit bundle for reuse for Java 7 tests | Robin Rosenberg | 2013-02-04 | 1 | -1/+1 |
* | Refactor ResolveMergerTest to allow testing multiple strategies | Christian Halstrick | 2012-10-25 | 1 | -35/+67 |
* | Add the intended file to avoid breakage | Robin Rosenberg | 2012-09-25 | 1 | -1/+1 |
* | cleanup: Prefer assertEquals over assertTrue(....equals(...)) | Robin Rosenberg | 2012-09-03 | 1 | -5/+5 |
* | Again teach ResolveMerger to create more correct DirCacheEntry's | Christian Halstrick | 2012-07-26 | 1 | -0/+439 |
* | Revert "Teach ResolveMerger to create more correct DirCacheEntry's" | Shawn Pearce | 2012-07-24 | 1 | -177/+1 |
* | Teach ResolveMerger to create more correct DirCacheEntry's | Markus Duft | 2012-07-19 | 1 | -1/+177 |
* | Don't return success on failing paths in ResolveMerger | Robin Stocker | 2012-06-23 | 1 | -0/+98 |