[Git] IDEA-51187 Auto-merge on unstash.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 11 May 2011 13:19:21 +0000 (17:19 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 12 May 2011 07:39:37 +0000 (11:39 +0400)
commitae9c434238d31b6ae7cde7401532ffeb71dbe772
tree3b0ef07feb89c7635145cdbf5d4c2702e5d6801e
parent015c35b6592995c719faf6a96a4cd2b937a0683d
[Git] IDEA-51187 Auto-merge on unstash.

* dropStash moved to GitStashUtils.
* GitUnstashDialog captures conflicts and uses GitMergeConflictResolver.
plugins/git4idea/src/git4idea/merge/GitMergeConflictResolver.java
plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
plugins/git4idea/src/git4idea/stash/GitStashUtils.java
plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java