Fixed issue #1973: Support INS/OVR mode in TortoiseMerge

Based on TortoiseSVN rev. #25529.

Signed-off-by: Sven Strickroth <email@cs-ware.de>