aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* Merge: Add diff3 style merge conflict formatter.Haamed Gheibi2023-07-311-33/+111
* Fix crashes on rare combination of file namesDmitrii Filippov2022-11-031-0/+26
* [merge] Fix merge conflicts with symlinksThomas Wolf2022-09-071-0/+296
* ResolveMerger: add coverage for inCore file => directory transitionHan-Wen Nienhuys2022-08-081-0/+33
* Merge conflict messages: prefix conflict lines with a hashThomas Wolf2022-01-311-8/+18
* [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
* GitlinkMergeTest: fix boxing warningsMatthias Sohn2020-09-051-1/+1
* Merge changes from topic "fix_ui"Terry Parker2020-09-031-0/+368
|\
| * ResolveMerger: do not content-merge gitlinks on del/mod conflictsDemetr Starshov2020-08-261-9/+0
| * ResolveMerger: Adding test cases for GITLINK deletionDemetr Starshov2020-08-261-0/+91
| * ResolveMerger: choose OURS on gitlink when ignoreConflictsDemetr Starshov2020-08-261-5/+0
| * ResolveMerger: Adding test cases for GITLINK mergeDemetr Starshov2020-08-261-0/+291
* | Keep line endings for text files committed with CR/LF on text=autoThomas Wolf2020-08-171-1/+43
|/
* SimpleMergeTest: Clean up code styleDemetr Starshov2020-06-101-156/+149
* 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-047-266/+35
* Close ObjectReaders in testsThomas Wolf2019-10-211-3/+3
* Close some Repository instances in testsThomas Wolf2019-10-211-2/+2
* Close TreeWalks in testsThomas Wolf2019-10-152-46/+50
* 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
| | * Deprecate Constants.CHARACTER_ENCODING in favor of StandardCharsets.UTF_8David Pursehouse2019-06-191-1/+2
| | * 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-302-2/+2
* | Deprecate Constants.CHARACTER_ENCODING in favor of StandardCharsets.UTF_8David Pursehouse2018-09-301-1/+2
* | Make inner classes static where possibleDavid Pursehouse2018-09-261-2/+2
|/
* Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8David Pursehouse2018-09-042-9/+10
* Specify charset when constructing InputStreamReaderDavid Pursehouse2018-09-021-1/+3
* Fix ResolveMerger: rebase with autocrlf=true, direct checkoutThomas Wolf2018-08-131-0/+39
* Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-153-3/+3
* Rename RecursiveMergerTest and ResolveMergerTest to reduce confusionDavid Pursehouse2018-03-242-2/+2
* ResolveMergerTest: Use @DataPoints instead of @DataPointDavid Pursehouse2018-03-241-6/+4
* Open auto-closeable resources in try-with-resourceDavid Pursehouse2018-03-131-12/+14
* Consistently use Constants.CHARSET rather than StandardCharsets.UTF_8David Pursehouse2018-03-111-7/+7
* RecursiveMergerTest: Open FileOutputStream in try-with-resourceDavid Pursehouse2018-02-261-33/+28
* Basic submodule merge handlingDavid Turner2018-02-041-0/+151
* Fix index blob for merges with CRLF translationsThomas Wolf2018-02-021-0/+3
* Honor CRLF settings when writing merge resultsThomas Wolf2018-02-021-0/+29
* Use constants from StandardCharsets instead of hard-coded stringsDavid Pursehouse2017-12-071-4/+3
* Avoid loading and merging binary data in ResolveMergerHan-Wen Nienhuys2017-10-241-0/+142
* Support creating Mergers without a RepositoryDave Borowitz2017-04-052-1/+162
* Merge "Make diff locations more consistent"Shawn Pearce2017-04-041-0/+39
|\
| * Make diff locations more consistentKB Sriram2017-04-031-0/+39
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:22:36 +0000