From 684f0da706cb1238ec72eb8e74855833a6879559 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Wed, 10 Oct 2012 16:20:35 +0400
Subject: [PATCH] GitImpl.stashPop: don't forget to add listeners.

Otherwise conflict on unstash is treated as error, although the conflict resolver starts fine afterwards.
---
 plugins/git4idea/src/git4idea/commands/GitImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git4idea/src/git4idea/commands/GitImpl.java b/plugins/git4idea/src/git4idea/commands/GitImpl.java
index 557869ee51b5..881c63254ed7 100644
--- a/plugins/git4idea/src/git4idea/commands/GitImpl.java
+++ b/plugins/git4idea/src/git4idea/commands/GitImpl.java
@@ -184,6 +184,7 @@ public class GitImpl implements Git {
   public GitCommandResult stashPop(@NotNull GitRepository repository, @NotNull GitLineHandlerListener... listeners) {
     final GitLineHandler handler = new GitLineHandler(repository.getProject(), repository.getRoot(), GitCommand.STASH);
     handler.addParameters("pop");
+    addListeners(handler, listeners);
     return run(handler);
   }