diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java | 11 |
1 files changed, 11 insertions, 0 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 6159839b13..901d1b516b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java @@ -74,6 +74,17 @@ public enum RepositoryState { }, /** + * An merge where all conflicts have been resolved. The index does not + * contain any unmerged paths. + */ + MERGING_RESOLVED { + public boolean canCheckout() { return true; } + public boolean canResetHead() { return true; } + public boolean canCommit() { return true; } + public String getDescription() { return "Merged"; } + }, + + /** * An unfinished rebase or am. Must resolve, skip or abort before normal work can take place */ REBASING { |