define({"0":{y:0,u:"../Content/P4Merge/about.whatsnew.html",l:-1,t:"  What\u0027s new in this guide",i:0.100595187597969,a:"What\u0027s new in P4 Merge Learn what\u0027s new in P4 Merge for each release. 2025.2 No new features in this release. See the  Release Notes. 2025.1 No new features in this release. See the  Release Notes. 2024.4 No new features in this release. See the  Release Notes. 2024.3 No new features in this ..."},"1":{y:0,u:"../Content/P4Merge/diff-merge.html",l:-1,t:"Diffing and merging files with P4 Merge",i:0.100595187597969,a:"P4 Merge is a visual diff tool that displays the differences between file\n      versions and helps you to resolve conflicts and merge competing versions\n      into one. You can use P4 Merge both with:  files that are versioned in P4 Server files that are not versioned in P4 Server This chapter ..."},"2":{y:0,u:"../Content/P4Merge/diff-merge.text_diff.html",l:-1,t:"Diffing text files",i:0.129097158046781,a:"In its diff mode, P4 Merge enables you to compare two text files to\n      locate differences. (P4 Merge can also  diff image files .) The purple icon ( ) is associated with the\n      first file you selected, and purple bands highlight text that is in the\n      first file but not the second file. The ..."},"3":{y:0,u:"../Content/P4Merge/diff-merge.image_diff.html",l:-1,t:"Diffing images",i:0.21032777546778,a:"P4 Merge lets you diff the following image file types: BMP GIF JPG, JPEG PNG PBM PGM PPM TIFF XBM XPM You can compare two different image files or two revisions of the same image. For information on diffing images from within P4V, see  Diffing images  in the  P4 Visual Client (P4V) Documentation . ..."},"4":{y:0,u:"../Content/P4Merge/diff-merge.p4merge.html",l:-1,t:"Merging files",i:0.129097158046781,a:"P4 Merge enables you to\n      compare two text files with a common base file to locate differences and\n      to select the text that you want in the merged result file. The purple\n      icon ( ) is associated with the\n      file that another user edited (their file), and purple\n      bands highlight ..."},"5":{y:0,u:"../Content/P4Merge/p4merge-preferences.html",l:-1,t:"Setting preferences",i:0.129097158046781,a:"Settings that persist between sessions  To set your preferences for application font, text format, file format (including character encoding, such as Unicode), application language, icon scaling, application color scheme (Light or Dark), and comparison method, go to Edit \u003e Preferences (Windows) or  ..."},"6":{y:0,u:"../Content/Shared/glossary.html",l:-1,t:"Glossary",i:0.100595187597969,a:"Glossary"},"7":{y:0,u:"../Content/P4Merge/license.statements.html",l:-1,t:"License statements",i:0.100595187597969,a:"License statements For the licensing information of the third-party software included in this Perforce product, see the  License file for P4 Admin, P4 Merge, and P4 Visual Client (P4V) ."},});