diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-09-02 12:10:09 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-09-02 12:10:10 -0400 |
| commit | 0f5eae53d6ff6ab8390c70232fd238943c264df2 (patch) | |
| tree | 0ef654c55b45eab638598f3af4b626b6fc80e71a /org.eclipse.jgit/src | |
| parent | a2f57dd4913cde87b05c1e62e452bb91e822a6f3 (diff) | |
| parent | f714988c61bc188fd5e9ce6a848e4f19690f48a5 (diff) | |
| download | jgit-0f5eae53d6ff6ab8390c70232fd238943c264df2.tar.gz jgit-0f5eae53d6ff6ab8390c70232fd238943c264df2.zip | |
Merge "Fix RepositoryState.MERGING"
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java | 4 |
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 0a59906e94..e0b5389ac0 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; } }, |