Fixed issue #988: Stash pop/apply fail should have a button for viewing conflicts
commit77519ad343a18a96e47a385320f010c1e780f40e
authorSven Strickroth <email@cs-ware.de>
Sat, 3 Dec 2011 17:24:12 +0000 (3 18:24 +0100)
committerSven Strickroth <email@cs-ware.de>
Sat, 3 Dec 2011 17:24:12 +0000 (3 18:24 +0100)
treeced6ec2af5614fc8047e3b6692c918a05a73ce02
parent3fdf6bce8b5d94a12580ff7fb33bd905d527ce15
Fixed issue #988: Stash pop/apply fail should have a button for viewing conflicts

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt
src/TortoiseProc/AppUtils.cpp