Fixed issue #446: TortoiseMerge crash when "Edit Conflicts"