diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 949ab5f449..ab82dd0c30 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -133,6 +133,8 @@ public class ResolveMerger extends ThreeWayMerger { /** * Handler for repository I/O actions. + * + * @since 6.3 */ protected WorkTreeUpdater workTreeUpdater; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java index f3531a6d1f..fb0b33a042 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java @@ -58,8 +58,11 @@ import org.eclipse.jgit.util.io.EolStreamTypeUtil; /** * Handles work tree updates on both the checkout and the index. * <p> - * You should use a single instance for all of your file changes. In case of an error, make sure - * your instance is released, and initiate a new one if necessary. + * You should use a single instance for all of your file changes. In case of an + * error, make sure your instance is released, and initiate a new one if + * necessary. + * + * @since 6.3 */ public class WorkTreeUpdater implements Closeable { |