aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge
Commit message (Expand)AuthorAgeFilesLines
* 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
* | ResolveMergerTest: Add tests for content mergesDave Borowitz2017-04-041-0/+58
|/
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-3/+3
* Organize importsDavid Pursehouse2016-11-141-1/+1
* Use FS#lastModified instead of File#lastModifiedMasaya Suzuki2016-08-241-12/+14
* Revert "Fix warnings about unchecked conversion of MergeResult"Shawn Pearce2016-02-151-1/+1
* Fix warnings about unchecked conversion of MergeResultDavid Pursehouse2016-02-151-1/+1
* RecursiveMergerTest: Open TreeWalk and BufferedReader in try-with-resourceDavid Pursehouse2016-02-121-15/+14
* ResolveMergerTest: Open Git in try-with-resourceDavid Pursehouse2016-02-051-29/+30
* SquashMessageFormatterTest: Open git in try-with-resourceDavid Pursehouse2016-02-051-11/+12
* Repository: Introduce exactRef and findRef, deprecate getRefJonathan Nieder2015-11-253-26/+26
* Fix ResolveMerger when files should be replaced by foldersChristian Halstrick2015-07-231-0/+74
* Access static member LocalDiskRepositoryTestCase.CONTENT directlyMatthias Sohn2015-07-141-6/+7
* Do not add a newline at the end if neither merged side had oneAndré de Oliveira2015-03-272-12/+54
* Fix RecursiveMerger in case of multiple, independent base commitsChristian Halstrick2015-03-251-0/+63
* Revert "CommitBuilder should check for duplicate parents"Jonathan Nieder2015-03-181-108/+0
* CommitBuilder should check for duplicate parentsChristian Halstrick2015-03-121-0/+108
* RecursiveMerger should not fail on content-merge conflicts of parentsChristian Halstrick2014-07-281-0/+83
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 18:10:58 +0000