aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge
Commit message (Expand)AuthorAgeFilesLines
* Add Union merge strategy supportNasser Grainawi2024-11-041-0/+45
* [errorprone] Fix pattern CatchAndPrintStackTraceMatthias Sohn2024-04-291-12/+13
* ResolveMerger: Fix the issue with binary modify-modify conflictsSruteesh2024-04-251-8/+1
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* MergeGitAttributeTest: Open FileInputStream in try-with-resourceDavid Pursehouse2018-02-261-27/+17
* Cleanup: Organize importsMatthias Sohn2017-08-301-1/+1
* Support -merge attribute in binary macroMathieu Cartaud2017-06-271-0/+585