Beyond Compare [0] has manual alignment. It works within files as well as within directories, allowing you to match up files with different names when comparin

Beyond Compare [0] has manual alignment. It works within files as well as within directories, allowing you to match up files with different names when comparing directories. I don't think it has syntax-aware alignment, though. [0]: https://www.scootersoftware.com/ https://www.scootersoftware.com/