Add a "replace" and a "replace all" button to the TMerge find dialog
commited1560e85e433acc25f148f8c322705a2a8f9ec2
authorSven Strickroth <email@cs-ware.de>
Wed, 4 Jun 2014 21:20:42 +0000 (4 23:20 +0200)
committerSven Strickroth <email@cs-ware.de>
Thu, 5 Jun 2014 08:47:25 +0000 (5 10:47 +0200)
treec06a59a233ca46b6312728c2ac2cae75393a056d
parent6429a548d05253f91c8591ec8c2d993eb5191561
Add a "replace" and a "replace all" button to the TMerge find dialog

Based on TortoiseSVN revisions #25531, #25533, #25536, and #25537.

(fixes issue #1970)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt
src/Resources/TortoiseMergeENG.rc
src/TortoiseMerge/BaseView.cpp
src/TortoiseMerge/BaseView.h
src/TortoiseMerge/FindDlg.cpp
src/TortoiseMerge/FindDlg.h
src/TortoiseMerge/resource.h