You can use the same tool in Windows and in Linux. It will be based on Qt library and cross-platform. WinMerge 3 will be modern compare/synchronization tool. It can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.Īt the time of writing this blog post, WinMerge 3 is still in progress of development and no release yet. WinMerge is an open source differencing and merging tool for Windows. gitconfig and manually add the config code. cmd = "diffmerge -merge -result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\" then echo \"$BASE\" else echo \"$LOCAL\" fi)\" \"$REMOTE\"" trustExitCode = true cmd = diffmerge \" $LOCAL \" \" $REMOTE \" tool = diffmerge prompt = false keepBackup = false keepTemporaries = false tool = diffmerge
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. Archives
February 2023
Categories |