From f714988c61bc188fd5e9ce6a848e4f19690f48a5 Mon Sep 17 00:00:00 2001 From: Jens Baumgart Date: Thu, 2 Sep 2010 18:01:47 +0200 Subject: [PATCH] Fix RepositoryState.MERGING canResetHead now returns true. Resetting mixed / hard works in EGit in merging state. Change-Id: I1512145bbd831bb9734528ce8b71b1701e3e6aa9 Signed-off-by: Jens Baumgart --- .../src/org/eclipse/jgit/lib/RepositoryState.java | 4 ++-- 1 file 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 0a59906e9..e0b5389ac 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; } },