P4Merge
The Perforce Merge Tool, P4Merge, provides graphical three-way merging and side-by-side file comparisons. P4Merge allows users to visualize the differences between file versions.
- Free
- Mac OS X
- Windows
- Linux
the perforce merge tool, p4merge, provides graphical threeway merging and sidebyside file comparisons.
p4merge allows users to visualize the differences between file versions. p4merge uses color coding to simplify the process of resolving conflicts that result from parallel or concurrent development. * text files differences can be highlighted and edited * includes or ignores line ending or whitespace differences * supports windows (crlf), mac (cr), and unix (lf) line ending conventions * accepts commandline parameters and can be used from nonpeforce applications * displays line numbers when comparing and merging files
Links to official P4Merge sites
Features
Categories
Productivity Developer Tools File Management
Tags
side-by-side-comparison diff file-compare difference differences visual-merge
