Another problem is that I cannot specify the diff3 program when I merge revisions containing ".dtxml" files between branches. The TortoiseSVN seems to use the default diff3 program to merge my revisions, which is fine but not as good as my own program. 在2022年3月23日星期三 UTC+8 18:34:59<bingsheng xue> 写道：
> Hi, > > I want to always use my own diff3 program only for "*.dtxml" files, but I > can't find any way to config that. My diff3 program is only able to merge > my "*.dtxml" files and not able to merge any other types of files. > > For now, if I want to update a folder that contains several types of > files, I can only use "svn update" command to update them using the default > internal diff3 program for all files, or I can use "svn update --diff3-cmd > myprogram.exe" to update them all using my diff3 program (which would cause > a problem if there are other types of files). > > (Note: The DIFF-VIEWER or MERGE-TOOL advanced settings in Tortoise are not > able to do this work. They are only previewing GUI programs and only run > when you click the modified/conflicted file status row in the TortoiseSVN > window.) > > Any help would be much appreciated! Thank you all! > -- You received this message because you are subscribed to the Google Groups "TortoiseSVN-dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/9fe2de41-9202-4965-aa38-3287ed892ae0n%40googlegroups.com.
