aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/notes/NotesMergeConflictException.java
Commit message (Expand)AuthorAgeFilesLines
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Fix javadoc in org.eclipse.jgit nls and notes packageMatthias Sohn2017-12-191-2/+3
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-2/+2
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Merging Git notesSasa Zivkov2011-01-091-0/+110