I've been using Beyond Compare from Scooter Software for more than 13 years and use it many times everyday. It is very powerful, flexible, and can be as simple or as complex as you like. I generate many configuration files used to deploy Azure Resources and Policies using automation scripts to a temp folder and compare that to the Git Repo folders on my local PC using the directory and file compare features in Beyond Compare. It's very easy to quickly identify the differences and locate potential issues when changing the automation scripts. When everything is correct, I can then run the scripts against the Local Master Repo, commit, merge, and trigger pipeline deployments. I also use it to help with migration to a new PC, for locating differences when hunting for a file from restored backups, for comparing CVS data files, etc... I could not do my job as effectively if using other Directory and File compare and merge tools and is worth every penny.