![]() # (it lets through everything not specified)def: include # This filter suppresses various binaries found in Visual C# source treesĭesc: Suppresses various binaries found in Visual C# source trees # This is a directory/file filter for WinMerge I have modified the original version to include my switches.Ĭreate a batch file with the following content: ![]() Regardless of this, this batch workaround seems to work well. He tested WinMerge and found that it does correctly return 0. This problem and workaround was originally found here by a colleague. If you encounter an error that says “The manual merge for has been canceled”, the fix is to use a batch file to redirect the call to WinMerge to ensure a 0 return code. Note: You need to click on the Save button on the tool bar within WinMerge merge to commit a merge before exiting the screen Merge Error Workaround
0 Comments
Leave a Reply. |