P4Merge tracks the effects of past and current work on branches and individual files and compares them. It can also be used to resolve conflicts, especially with Git. P4Merge allows you to easily see the differences between file versions. Do you want to know what happened in a given time frame? Folder Diff shows the history between any two points in a given time. To easily identify pixel-level changes, overlay two images. Highlight and edit differences in text files. You can choose to include or ignore line ends/white spaces. Line-ending conventions are recognized for Windows, Mac, Unix, and Unix. When merging and comparing files, display line numbers. Check for any code that needs to be fixed in pending mergers. Files that are modified, unique or unchanged should be excluded. Modified assets should be organized in familiar file/folder hierarchy. Compare JPEGs, GIFs, TIFFs, BMP, and other file types. To see changes, overlay images or display side by side.