Fix RepositoryState.MERGING

canResetHead now returns true.
Resetting mixed / hard works in EGit in merging state.

Change-Id: I1512145bbd831bb9734528ce8b71b1701e3e6aa9
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java
index 0a59906e94eec2168a5d43439edc2d81c7bc67d1..e0b5389ac02d92551de2934fd078a5136dd4bcf8 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java
@@ -73,11 +73,11 @@ public enum RepositoryState {
                public String getDescription() { return JGitText.get().repositoryState_normal; }
        },
 
-       /** An unfinished merge. Must resole or reset before continuing normally
+       /** An unfinished merge. Must resolve or reset before continuing normally
         */
        MERGING {
                public boolean canCheckout() { return false; }
-               public boolean canResetHead() { return false; }
+               public boolean canResetHead() { return true; }
                public boolean canCommit() { return false; }
                public String getDescription() { return JGitText.get().repositoryState_conflicts; }
        },