BUG: [ 2791093 ] TortoiseSVN integration should omit -x

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 7956157..7226981 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -8,6 +8,7 @@ WinMerge 2.13.7
   Improve startup time (#2788142)
   Create config log file to My Documents-folder (#2789839)
   Installer: Do not install DLL plugins (#2783915)
+  Installer: Don't set -x for TSVN command line (#2791093)
   Bugfix: Crash if tabs or EOLs in command line (#2726995)
   Bugfix: Reports had same left/right descriptions (#2772646)
   Bugfix: Diff view highlighted last char diff incorrectly (#2785186)

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index 74d66aa..41a1949 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -530,7 +530,7 @@ Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; Value
 Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
 
 ;Set WinMerge as TortoiseSVN diff tool
-Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
 
 ;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
 ;(unless the user already has a startup language specified)