diff options
| author | Dani Megert | 2013-03-22 09:27:25 +0000 |
|---|---|---|
| committer | Dani Megert | 2013-03-22 09:27:25 +0000 |
| commit | 54226ec8ef6fb8eec7857b4f85d0b601325acc02 (patch) | |
| tree | df7e73fb09bbfaebbfc4d3cf5a0b6da9412cf9b8 | |
| parent | 50ef17edf61a2d7838b2fad1dfa145de60e5b53c (diff) | |
| download | egit-54226ec8ef6fb8eec7857b4f85d0b601325acc02.tar.gz egit-54226ec8ef6fb8eec7857b4f85d0b601325acc02.tar.xz egit-54226ec8ef6fb8eec7857b4f85d0b601325acc02.zip | |
Add missing @since tag
Change-Id: I6b4b36922f91df7e118310f8a66eace44e771923
Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java index 2bf0eefc0b..3aa833aa03 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergeOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 SAP AG. + * Copyright (c) 2010, 2013 SAP AG and others. * Copyright (C) 2012, 2013 Tomasz Zarna <tzarna@gmail.com> * * All rights reserved. This program and the accompanying materials @@ -93,6 +93,7 @@ public class MergeOperation implements IEGitOperation { /** * @param ffmode set the fast forward mode + * @since 3.0 */ public void setFastForwardMode(FastForwardMode ffmode) { this.fastForwardMode = ffmode; |