If you want to include subfolders, click to select the Include subdirectories check box. In the Select Directories dialog box, type the two folder names that you want to compare in the Dir1 and Dir2 boxes. On the File menu, click Compare Directories.
I guess the best I can hope for is a new feature in SourceTree that would allow us to select one of the configured difftools as an "advanced" External Diff. To compare two folders by using Windiff.exe, follow these steps: Start Windiff.exe. I also setup the extensions in gitattributes like `*.acd binary diff=LogixCompare`, but doing an external diff on such a file still just opens WinMerge (my default difftool as shown above).ĮDIT: I now know that gitattributes only launches a diff driver which is different from a difftool. I already have all the different difftools and mergetools setup in my global config like so:Ĭmd = \"C:\\Program Files\\WinMerge\\WinMergeU.exe\" -e -u -dl \"Old $BASE\" -dr \"New $BASE\" \"$LOCAL\" \"$REMOTE\"Ĭmd = \"C:\\Program Files (x86)\\Rockwell Software\\Logix Designer Tools\\Logix Designer Compare Tool\\RSLCompare.exe\" \"$LOCAL\" \"$REMOTE\" -PM FastestCompare I would like to be able to launch the proper diff program when right-clicking a file and selecting `External Diff`. I have multiple different binary filetypes that require different programs to diff and merge.
0 kommentar(er)
