• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28657 (tree)
Time2019-08-16 22:42:43
Authorstefankueng

Log Message

don't show an error dialog if the user cancels saving the patch file.

Change Summary

Incremental Difference

--- trunk/src/TortoiseMerge/MainFrm.cpp (revision 28656)
+++ trunk/src/TortoiseMerge/MainFrm.cpp (revision 28657)
@@ -1,6 +1,6 @@
11 // TortoiseMerge - a Diff/Patch program
22
3-// Copyright (C) 2004-2018 - TortoiseSVN
3+// Copyright (C) 2004-2019 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -2763,6 +2763,8 @@
27632763 }
27642764 }
27652765 }
2766+ else
2767+ return; // user cancelled
27662768 }
27672769
27682770
Show on old repository browser