aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java
Commit message (Expand)AuthorAgeFilesLines
* Fix crashes on rare combination of file namesDmitrii Filippov2022-11-031-0/+26
* ResolveMerger: add coverage for inCore file => directory transitionHan-Wen Nienhuys2022-08-081-0/+33
* [test] Fix closing of test repositoriesNail Samatov2022-01-301-0/+1
* Make the buffer size for text/binary detection configurableThomas Wolf2021-10-301-1/+7
* Allow file mode conflicts in virtual base commit on recursive merge.Marija Savtchouk2021-04-061-0/+76
* Allow dir/file conflicts in virtual base commit on recursive merge.Marija Savtchouk2021-02-091-0/+264
* Keep line endings for text files committed with CR/LF on text=autoThomas Wolf2020-08-171-1/+43
* ResolveMerger: Ignore merge conflicts if asked soIvan Frade2020-03-191-0/+88
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Close some Repository instances in testsThomas Wolf2019-10-211-2/+2
* Fix NarrowingCompoundAssignment warnings from Error ProneDavid Pursehouse2019-08-081-2/+2
* Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2019-08-081-21/+26
|\
| * Merge branch 'stable-5.1' into stable-5.2Matthias Sohn2019-08-081-21/+26
| |\
| | * Use Instant instead of milliseconds for filesystem timestamp handlingMatthias Sohn2019-07-181-21/+26
| | * Make inner classes static where possibleDavid Pursehouse2019-06-171-2/+2
* | | MergerTest: Open TestRepository in try-with-resourceDavid Pursehouse2019-01-201-8/+9
* | | Avoid double wordsMincong HUANG2018-12-211-1/+1
|/ /
* | MergeFormatter{Pass}: Use Charset instead of StringDavid Pursehouse2018-09-301-1/+1
* | Make inner classes static where possibleDavid Pursehouse2018-09-261-2/+2
|/
* Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8David Pursehouse2018-09-041-7/+8
* Fix ResolveMerger: rebase with autocrlf=true, direct checkoutThomas Wolf2018-08-131-0/+39
* Rename RecursiveMergerTest and ResolveMergerTest to reduce confusionDavid Pursehouse2018-03-241-0/+1333
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-09 19:35:19 +0000