]> source.dussan.org Git - jgit.git/commit
Fix javadoc in org.eclipse.jgit merge package 35/113635/4
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 18 Dec 2017 16:07:03 +0000 (17:07 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 19 Dec 2017 12:48:55 +0000 (13:48 +0100)
commita2f2f6539093f3a2a246ab3c09aa8f6c6c325386
tree91556762be8cfba87595a969ca98efa29f09f49f
parent8a6af368c4129ef35520ec72cc9f55a3f685bfb8
Fix javadoc in org.eclipse.jgit merge package

Change-Id: I735d0f2e9f10531ed43b7b3dd6314c574392422f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
16 files changed:
org.eclipse.jgit/src/org/eclipse/jgit/merge/EolAwareOutputStream.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeResult.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyOneSided.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMergeStrategy.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java