From f5be93d003759f6c933d33d56c8a18fa9e66766b Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Thu, 18 Jul 2013 20:04:47 +0200 Subject: 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 --- org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3