Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [performance] Remove synthetic access$ methods in dfs, diff and merge | Andrey Loskutov | 2015-10-28 | 1 | -2/+2 |
* | Fix API errors raised on ResolveMerger affecting API providers only | Christian Halstrick | 2014-07-31 | 1 | -0/+1 |
* | RecursiveMerger should not fail on content-merge conflicts of parents | Christian Halstrick | 2014-07-28 | 1 | -0/+12 |
* | Refactor diff sequence API | Shawn O. Pearce | 2010-09-06 | 1 | -4/+7 |
* | Add file content merge algorithm | Christian Halstrick | 2010-01-06 | 1 | -0/+161 |