diff options
| author | Robin Stocker <robin@nibor.org> | 2013-07-18 20:04:47 +0200 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2013-07-18 20:05:29 +0200 |
| commit | f5be93d003759f6c933d33d56c8a18fa9e66766b (patch) | |
| tree | 568aeb8e1a6868fc717e089c14a723e9d24f804c | |
| parent | 6bbc32a8bea82e5bd2589ef02334ecee637d6f72 (diff) | |
| download | jgit-f5be93d003759f6c933d33d56c8a18fa9e66766b.tar.gz jgit-f5be93d003759f6c933d33d56c8a18fa9e66766b.zip | |
Fix MERGED_NOT_COMMITTED toString
It had a typo (commited) and was not in the style of the others.
Change-Id: Ia1be1c70b13bb2f3da80c8e8239c5f254070fe60
Signed-off-by: Robin Stocker <robin@nibor.org>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java index c34ba6b2d1..30edf961f1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java @@ -186,7 +186,7 @@ public class MergeResult { **/ MERGED_NOT_COMMITTED { public String toString() { - return "MergedNotCommited"; + return "Merged-not-committed"; } @Override |