aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatterPass.java
Commit message (Expand)AuthorAgeFilesLines
* Merge: Add diff3 style merge conflict formatter.Haamed Gheibi2023-07-311-12/+60
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* MergeFormatterPass: Remove constructor taking charset name as stringJonathan Nieder2018-09-301-25/+0
* MergeFormatter{Pass}: Use Charset instead of StringDavid Pursehouse2018-09-301-3/+43
* Add missing newlines at ends of Java filesDavid Pursehouse2017-07-251-1/+1
* Do not add a newline at the end if neither merged side had oneAndré de Oliveira2015-03-271-0/+146