Allow to view diff on Delete/Modified conflict
commitdfa3c249b261c4eb2926b4af4c0713d5bfb0be23
authorSven Strickroth <email@cs-ware.de>
Sat, 8 Jul 2017 09:01:05 +0000 (8 11:01 +0200)
committerSven Strickroth <email@cs-ware.de>
Sat, 8 Jul 2017 09:01:05 +0000 (8 11:01 +0200)
tree01169a37e6eb0810b838b3391989cabb0c0994c9
parent2f060a33b47567f29cfd477aa02f9051a5f511db
Allow to view diff on Delete/Modified conflict

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Languages/Tortoise.pot
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/DeleteConflictDlg.cpp
src/TortoiseProc/DeleteConflictDlg.h
src/TortoiseProc/resource.h