aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
Commit message (Expand)AuthorAgeFilesLines
* Fix CommitCommand not to destroy repoChristian Halstrick2013-05-111-0/+27
* Add the no-commit option to MergeCommandTomasz Zarna2013-04-041-0/+125
* Indicate initial commit on a branch in the reflogRobin Rosenberg2013-04-021-2/+2
* Move base test classes to the junit bundle for reuse for Java 7 testsRobin Rosenberg2013-02-041-1/+1
* Fix Check for FF_ONLY merges againRobin Rosenberg2013-01-291-22/+35
* Check for FF_ONLY merges correctlyRobin Rosenberg2013-01-291-0/+39
* Declare essentially static methods as staticRobin Rosenberg2012-12-271-3/+3
* Use assertEquals instead of == for literal primitivesRobin Rosenberg2012-09-161-2/+2
* Fix order of deletion for files/dirs in ResolveMergerRobin Stocker2012-06-231-0/+45
* Add "--squash" option to MergeCommandTomasz Zarna2012-06-151-1/+188
* Fix MergeCommandTest to pass if File.executable is not supportedRobin Rosenberg2011-12-151-4/+12
* Fix ResolveMerger not to add paths with FileMode 0Christian Halstrick2011-12-111-0/+75
* Test the reflog message for commit, cherry-pick, revert and mergeRobin Rosenberg2011-09-211-1/+36
* Fix ClassCastException in MergeCommandDenys Digtiar2011-08-211-0/+31
* Merge doesn't remove empty foldersTomasz Zarna2011-07-131-0/+41
* Create a MergeResult for deleted/modified filesBernard Leach2011-05-191-0/+42
* Implemented merge for parallel delete/modificationBernard Leach2011-05-031-0/+63
* Add "Conflicts" section to merge message on conflictRobin Stocker2011-04-061-0/+32
* Improve MergeResultPhilipp Thun2011-03-211-4/+11
* Refactor test casesPhilipp Thun2011-03-211-27/+0
* Abort merge when file to be checked out is dirtyPhilipp Thun2011-03-181-0/+158
* Refactor ResolveMergerPhilipp Thun2011-03-181-0/+4
* Adapt expected commit message in testsRobin Stocker2011-02-021-2/+2
* Convert all JGit unit tests to JUnit 4Robin Rosenberg2010-12-311-0/+22
* Fixed Merge Algorithm regarding concurrent file creationsChristian Halstrick2010-12-021-0/+79
* Fix bug regarding handling of non-versioned files during mergeChristian Halstrick2010-11-221-0/+50
* Fix broken MergeCommandTestMatthias Sohn2010-11-101-2/+2
* Fixed ResolveMerger regarding handling of deletionsChristian Halstrick2010-11-071-0/+42
* Add a test for merging deleted filesChristian Halstrick2010-11-031-0/+52
* Refactor Git API exceptions to a new packageChris Aniszczyk2010-09-011-0/+1
* Added merge strategy RESOLVEChristian Halstrick2010-08-311-36/+264
* Make Commit class only for writingShawn O. Pearce2010-08-201-2/+2
* Rename Repository getWorkDir to getWorkTreeShawn O. Pearce2010-06-251-9/+9
* Add a merge command to the jgit APIStefan Lay2010-05-241-0/+183