Browse Source

Remove wrong comment in MergeCommand

There was a wrong javadoc comment telling that MergeCommand
only supports fast-forward merges. This has been fixed.

Change-Id: I7edea779a83528beee34a1753026288c384881ce
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
stable-0.10
Christian Halstrick 14 years ago
parent
commit
be93452842
  1. 3
      org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java

3
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java

@ -82,9 +82,6 @@ import org.eclipse.jgit.treewalk.FileTreeIterator;
* supported options and arguments of this command and a {@link #call()} method
* to finally execute the command. Each instance of this class should only be
* used for one invocation of the command (means: one call to {@link #call()})
* <p>
* This is currently a very basic implementation which takes only one commits to
* merge with as option. Furthermore it does supports only fast forward.
*
* @see <a href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html"
* >Git documentation about Merge</a>

Loading…
Cancel
Save