aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java
Commit message (Expand)AuthorAgeFilesLines
* Use branch.<x>.mergeoptions and merge.ff as defaults for mergingKonrad Kügler2014-02-141-0/+189