Adds git response into apply error message

eamodio · eamodio · commit 6b298b717316 · 2018-12-16T13:36:17.000-05:00
diff --git a/src/commands/stashApply.ts b/src/commands/stashApply.ts
@@ -131,7 +131,9 @@ export class StashApplyCommand extends Command {
                 return window.showInformationMessage(`Stash applied with conflicts`);
             }
             else {
-                return Messages.showGenericErrorMessage('Unable to apply stash');
+                return Messages.showGenericErrorMessage(
+                    `Unable to apply stash \u2014 ${ex.message.trim().replace(/\n+?/g, '; ')}`
+                );
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,9 @@ export class StashApplyCommand extends Command {`
`131`	`131`	return window.showInformationMessage(`Stash applied with conflicts`);
`132`	`132`	`}`
`133`	`133`	`else {`
`134`		`- return Messages.showGenericErrorMessage('Unable to apply stash');`
	`134`	`+ return Messages.showGenericErrorMessage(`
	`135`	+ `Unable to apply stash \u2014 ${ex.message.trim().replace(/\n+?/g, '; ')}`
	`136`	`+ );`
`135`	`137`	`}`
`136`	`138`	`}`
`137`	`139`	`}`