aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
Commit message (Expand)AuthorAgeFilesLines
* Merge: improve handling of case-variantsThomas Wolf2025-02-091-0/+92
* RefDatabase#getReflogReader(String): use #exactRef to resolve refNameMatthias Sohn2025-01-271-7/+11
* Deprecate Repository#getReflogReader methodsMatthias Sohn2025-01-271-24/+35
* Use git config core.commentCharThomas Wolf2022-03-261-0/+68
* Merge conflict messages: prefix conflict lines with a hashThomas Wolf2022-01-311-3/+3
* [test] Fix closing of test repositoriesNail Samatov2022-01-301-0/+1
* Implement ours/theirs content conflict resolutionThomas Wolf2021-04-191-10/+366
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* MergeCommandTest: Open TestRepository in try-with-resourceDavid Pursehouse2019-01-201-26/+31
* Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-151-1/+1
* Handle Gerrit Change-Ids for merge commitsThomas Wolf2018-04-181-15/+57
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-1/+1
* MergeCommandTest: Use JUnit's assume to check preconditionsDavid Pursehouse2016-02-121-4/+3
* MergeCommandTest: Open Git instances in try-with-resourceDavid Pursehouse2016-02-121-1202/+1212
* Repository: Introduce exactRef and findRef, deprecate getRefJonathan Nieder2015-11-251-23/+31
* Expose Sets helper to tests outside org.eclipse.jgit.apiJonathan Nieder2015-05-211-0/+1
* Handle -m option for Merge commandAxel Richard2014-08-301-1/+64
* Fix exception on conflicts with recursive mergeRobin Stocker2013-12-031-0/+34
* Remove dependency on StatusCommandTestShawn Pearce2013-11-011-3/+3
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-10 06:57:22 +0000