aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CrissCrossMergeTest.java
Commit message (Expand)AuthorAgeFilesLines
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Close ObjectReaders in testsThomas Wolf2019-10-211-3/+3
* Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8David Pursehouse2018-09-041-2/+2
* Specify charset when constructing InputStreamReaderDavid Pursehouse2018-09-021-1/+3
* Remove 'final' in parameter listsHan-Wen Nienhuys2018-05-151-1/+1
* Rename RecursiveMergerTest and ResolveMergerTest to reduce confusionDavid Pursehouse2018-03-241-0/+897