(Only available in WinMerge 64bit version on Windows 10).Add support for SVG, PDF, WMF and EMF file types.Bugfix: Support 16-bit images (GitHub WinMerge/winimerge issue #6).Add support for touchpad horizontal scroll (GitHub #254).Bugfix: Non-moved lines are treated as moved lines ( #39851).Bugfix: An error message is shown when pressing Enter key in Diff pane ( #39924).Bugfix: "Replace All" may not replace all text.Bugfix: WinMerge 2.16.4.0 crashes after de-selecting Split Vertically (GitHub #259).Bugfix: Prevent silent abort with File Comparison of files whose size is an exact multiple of 2^32 bytes (GitHub #257).Bugfix: GhostTextBuffer: Don't unexpectedly bring back empty lines user wants to delete (GitHub #244).Added CWindowsManagerDialog class for handling open tabs with Ctrl+Tab, now the application is behave just like professional editors (Visual Studio, Notepad++, etc.) to switch and activate the open tabs.(CompareMSExcelFiles.sct, IgnoreFieldsComma.dll, IgnoreFieldsTab.dll).Add support for C# and TypeScript (GitHub PR #382).CompareMSExcelFiles.sct: Include Excel Addin files (*.xlam) (GitHub PR #269).Bugfix: Error when comparing images in the CompareMSExcelFiles.sct plugin ( #40472).Bugfix: Fix handling of line breaks in SortAscending, SortDescending ( PR #40266).Bugfix: Pressing the category button in the Options dialog twice will cause a crash.Browse button in the file/dir selection show wrong path (GitHub #346).Bugfix: Open dialogs are sometimes left as garbage ( #40487).Bugfix: Scrolling behavior when dragging images is wrong ( #40205).added bin and obj directories to C# filter (GitHub PR #365).Add a feature generating a patch from directories (#283) (GitHub PR #331).Bugfix: crash when clicking -> menu item while renaming a file.Bugfix: Fix a problem where a text file could be considered a binary file.I noticed that when I change anything in tools > Options none of the gitconfig files are changed and it looks like SourceTree stores settings in a different file."Binary" or "Compare As" > "Image" in the context menu in the folder compare window with selecting 3 items. I've tried to find all gitconfig files and Total Commander gave me few:
I've tried to change diff/merge tools to another one but error was the same. When I try to launch external diff tool by RMC -> External Diff in Process Viewer I see the following: I use IntelliJ IDEA tool and set it as follows in Tools -> Options -> Diff -> External Diff/Merge section:Ĭmd = 'C:/Program Files/JetBrains/IntelliJ IDEA Community Edition 2019.1.3/bin/idea64.exe' diff $LOCAL $REMOTEĬmd = 'C:/Program Files/JetBrains/IntelliJ IDEA Community Edition 2019.1.3/bin/idea64.exe' merge $LOCAL $REMOTE $BASE $MERGED I've tried everything that I could find, but it didn't help much.
After update to 3.1.3 version of sourcetree I can't launch external diff/merge tool.
0 kommentar(er)
