Better indicate conflicts on stash pop and allow to automatically show changes

A small request. Please change the "stash pop failed" text back to red as it was before. At times I almost click "No" when prompted to check conflicts. In fact, I`m not even sure why you wouldn't want to check stash pop conflicts, it probably makes sense to open the conflicts dialog automatically when conflicts are present.