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.
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
Productivity Developer Tools File Management
side-by-side-comparison diff file-compare difference differences visual-merge
WinMerge 2011 series is a fork of the original WinMerge application that compiles without ATL/MFC dependencies.
winmerge jp is a fork of original winmerge that incorporates many own features including 3-way compare, high dpi support and many more.
