diff options
Diffstat (limited to 'plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java')
| -rw-r--r-- | plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java index 1743e7e5b56e..45ff24e382ce 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java @@ -33,7 +33,7 @@ import org.zmlx.hg4idea.ui.HgMergeDialog; import java.util.Collection; -public class HgMerge extends HgAbstractGlobalAction { +public class HgMerge extends HgAbstractGlobalSingleRepoAction { @Override public void execute(@NotNull final Project project, |