git update: after resolving conflicts during unstash, drop the stash
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 11 Mar 2011 11:19:56 +0000 (14:19 +0300)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 11 Mar 2011 11:19:56 +0000 (14:19 +0300)
commitd383fd24b5675e12d89ddf53391f28c90bfe20fb
treea9feec98abe7706c37258c92fcb0cb2519da7a5a
parent7c5891b638c607e06ff29c372b92d02743b9fabf
git update: after resolving conflicts during unstash, drop the stash
plugins/git4idea/src/git4idea/merge/GitMergeConflictResolver.java
plugins/git4idea/src/git4idea/update/GitStashChangesSaver.java