aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
Commit message (Expand)AuthorAgeFilesLines
* Fix exception on conflicts with recursive mergeRobin Stocker2013-12-031-20/+9
* Add missing @since tagsMatthias Sohn2013-03-221-0/+2
* Implement recursive merge strategyGeorge C. Young2013-02-221-11/+33
* Allow applications to pass ObjectInserter to MergerShawn O. Pearce2012-06-141-0/+19
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Ensure the ObjectInserter flushes after a mergeShawn O. Pearce2011-10-261-1/+4
* Fix ClassCastException in MergeCommandDenys Digtiar2011-08-211-1/+1
* Add getBaseCommit() to MergerChristian Halstrick2010-08-261-3/+22
* Use ObjectReader in RevWalk, TreeWalkShawn O. Pearce2010-06-281-7/+7
* Release ObjectInserter in merge() not mergeImpl()Shawn O. Pearce2010-06-281-1/+6
* Replace WindowCache with ObjectReaderShawn O. Pearce2010-06-251-2/+2
* Start using ObjectInserter instead of ObjectWriterShawn O. Pearce2010-06-251-6/+6
* Externalize strings from JGitSasa Zivkov2010-05-191-4/+5
* Initial JGit contribution to eclipse.orgGit Development Community2009-09-291-0/+235