[Git] Fixed message in notification. Relates to IDEA-51187.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 11 May 2011 14:40:12 +0000 (18:40 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 12 May 2011 07:39:38 +0000 (11:39 +0400)
plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java

index 7110aa8c8061f2a3443220f29a018a423a906112..fe1313da38160d180562dae17ff53b0c17e17e0a 100644 (file)
@@ -447,7 +447,7 @@ public class GitUnstashDialog extends DialogWrapper {
     private StashInfo myStashInfo;
 
     public UnstashConflictResolver(Project project, StashInfo stashInfo) {
-      super(project, true, new UnstashMergeDialogCustomizer(stashInfo), "Local changes were not restored", "");
+      super(project, true, new UnstashMergeDialogCustomizer(stashInfo), "Unstashed with conflicts", "");
       myStashInfo = stashInfo;
     }