icdiff vs P4Merge
| icdiff | P4Merge | |
|---|---|---|
| Free plan | No | No |
| Free trial | No | No |
| Paid from | — | — |
| Open source | No | No |
| Platforms | macOS, Linux | Linux, macOS, Windows |
| Three-way merge | No | Yes |
| Folder comparison | Yes | Yes |
| Git integration | Yes | Yes |
| Platform support | command_line | desktop |
| Merge scope | two_way | three_way |
| Free plan | — | Yes |
| Syntax highlighting | — | Yes |
Both are listed in Best Diff and Merge Tools. On Specifiction, P4Merge scores higher on our published basis.