aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge
Commit message (Expand)AuthorAgeFilesLines
* Support -merge attribute in binary macroMathieu Cartaud2017-06-272-0/+0