MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] Move GitCherryPicker to the proper package.

Browse Source
This commit is contained in:
Kirill Likhodedov
2013-01-02 17:23:30 +04:00
parent 35112f6c01
commit b2a709b07c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/cherrypick/GitCherryPickAction.java
-1
View File
@@ -29,7 +29,6 @@ import git4idea.GitPlatformFacade;
import git4idea.GitVcs;
import git4idea.commands.Git;
import git4idea.config.GitVcsSettings;
import git4idea.history.browser.GitCherryPicker;
import git4idea.history.browser.GitCommit;
import git4idea.history.wholeTree.AbstractHash;
import git4idea.history.wholeTree.GitCommitDetailsProvider;
plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java → plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
+2 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package git4idea.history.browser;
package git4idea.cherrypick;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationListener;
@@ -31,6 +31,7 @@ import git4idea.commands.Git;
import git4idea.commands.GitCommandResult;
import git4idea.commands.GitSimpleEventDetector;
import git4idea.commands.GitUntrackedFilesOverwrittenByOperationDetector;
import git4idea.history.browser.GitCommit;
import git4idea.merge.GitConflictResolver;
import git4idea.repo.GitRepository;
import git4idea.util.UntrackedFilesNotifier;
plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java
+1 -1
View File
@@ -30,7 +30,7 @@ import cucumber.annotation.en.And;
import cucumber.annotation.en.Given;
import cucumber.annotation.en.Then;
import cucumber.annotation.en.When;
import git4idea.history.browser.GitCherryPicker;
import git4idea.cherrypick.GitCherryPicker;
import git4idea.history.browser.GitCommit;
import git4idea.history.browser.SHAHash;
import git4idea.history.wholeTree.AbstractHash;