summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJens Baumgart2010-09-02 12:01:47 (EDT)
committer Jens Baumgart2010-09-02 12:01:47 (EDT)
commitf714988c61bc188fd5e9ce6a848e4f19690f48a5 (patch)
treeea76064f41caea8ffc14d9f4024234b13536cff9
parent7a504b8d7cf7a329774993ea94776a76886e4017 (diff)
downloadjgit-f714988c61bc188fd5e9ce6a848e4f19690f48a5.zip
jgit-f714988c61bc188fd5e9ce6a848e4f19690f48a5.tar.gz
jgit-f714988c61bc188fd5e9ce6a848e4f19690f48a5.tar.bz2
Fix RepositoryState.MERGINGrefs/changes/09/1509/1
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>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java4
1 files changed, 2 insertions, 2 deletions
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 0a59906..e0b5389 100644
--- 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; }
},