diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 18 |
1 files changed, 9 insertions, 9 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 a4c795cc55..cf969107d8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -90,8 +90,8 @@ import org.eclipse.jgit.util.FileUtils; */ public class ResolveMerger extends ThreeWayMerger { /** - * If the merge fails abnormally (means: not because of unresolved - * conflicts) this enum is used to explain why it failed + * If the merge fails (means: not stopped because of unresolved conflicts) + * this enum is used to explain why it failed */ public enum MergeFailureReason { /** the merge failed because of a dirty index */ @@ -629,22 +629,22 @@ public class ResolveMerger extends ThreeWayMerger { } /** - * @return lists paths causing this merge to fail abnormally (not because of - * a conflict). <code>null</code> is returned if this merge didn't - * fail abnormally. + * @return lists paths causing this merge to fail (not stopped because of a + * conflict). <code>null</code> is returned if this merge didn't + * fail. */ public Map<String, MergeFailureReason> getFailingPaths() { return (failingPaths.size() == 0) ? null : failingPaths; } /** - * Returns whether this merge failed abnormally (i.e. not because of a + * Returns whether this merge failed (i.e. not stopped because of a * conflict) * - * @return <code>true</code> if an abnormal failure occurred, - * <code>false</code> otherwise + * @return <code>true</code> if a failure occurred, <code>false</code> + * otherwise */ - public boolean failedAbnormally() { + public boolean failed() { return failingPaths.size() > 0; } |