Release Notes for Helix P4Merge, the Helix Visual Merge Tool Version 2024.3 Introduction Helix P4Merge is an end-user application designed for software developers. Helix P4Merge can run standalone and does not require a Helix Core Server or Helix P4V. Helix P4Merge is documented in help files that are embedded within the program. Perforce numbers releases YYYY.R/CCCCC, for example 2002.2/30547. YYYY is the year; R is the release of that year; CCCCC is the bug fix change level. Each bug fix in these release notes is marked by its change number. Any build includes (1) all bug fixes for all previous releases and (2) all bug fixes for the current release up to the bug fix change level. -------------------------------------------------------------------------- Important Platform End-of-Life Notice P4Merge no longer offers 32-bit builds as of 2021.2. This specifically impacts the following platforms: Windows 7 for Intel (x86) Windows 8.1 for Intel (x86) Windows 10 for Intel (x86) -------------------------------------------------------------------------- Licenses Licenses are detailed in the following page: https://filehost.perforce.com/perforce/r24.3/doc/user/p4v_license.txt -------------------------------------------------------------------------- Important Notes The P4V WebKit-based P4JsApi (the JavaScript API for Visual Tools) has been officially retired. It is replaced by P4VJS, which is a WebEngine-based solution that supports HTML5. More information, including a user guide and a conversion guide, is available on our website for those wishing to port their existing programs. Helix MFA is no longer installed by default. Customers are encouraged to evaluate the Helix Authentication Service and set up the 2FA step via their preferred Identity Provider (IdP). Any customer that wishes to continue using Helix MFA can install it separately from the Helix Visual Client (P4V). The unsupported P4V command syntax, "p4v -cmd" is discontinued as of P4V 2020.2. The actions available with the '-cmd' flag are replaced by P4VC commands. The "p4v -s" and "p4v -t" functionality will continue to be supported. For more information about P4VC, see: https://www.perforce.com/manuals/p4v/Content/P4V/advanced_options.p4vc.html -------------------------------------------------------------------------- Platform Notes Linux Ubuntu 22.04 requires an installation of the libxcb-cursor0 libraries to be able to run P4Merge 2023.4. This package can be installed by running: '$ sudo apt install libxcb-cursor0' P4Merge has a dependency on the 'libxcb-xinerama0' package, a XCB binding for multiple monitor support. On Ubuntu, this package is sometimes either not installed or not installed properly. If libxcb-xinerama0 is not found, P4Merge will throw an error at startup : qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. This package can be restored by running : '$ sudo apt install --reinstall libxcb-xinerama0' This package can be installed by running : '$ sudo apt install libxcb-xinerama0' On CentOS, if necessary, these packages can be installed by running the following commands: $ sudo yum install libxcb-xinerama.so.0 $ sudo yum install xcb-util-* Windows As of relase 2019.2, P4V started linking with QtWebEngine framework in order to offer the P4VJS feature. This Qt framework requires the computer that P4V is running on to have a graphics driver that provides OpenGL 2.1 or higher. The default driver for Windows 10 is OpenGL 1.1, but most new graphics cards provide a more recent OpenGL version that is 2.1 or higher. See the following KB article if encountering problems launching P4V from a Remote Desktop session (RDP) https://community.perforce.com/s/article/17508 -------------------------------------------------------------------------- Supported Platforms Microsoft Windows 10 (1809 or later) (x86_64) 11 (x86_64) macOS 11, 12, 13, 14 (x86_64 and arm64) Linux (x86_64) Red Hat 8.8, 9.2 Ubuntu 22.04 openSUSE 15.5 The above platforms are tested and subject to regression testing on a frequent basis. Errors or bugs discovered in these platforms are prioritized for correction. Any platform not listed above is not actively tested by Perforce. P4Merge might run on platforms that are not actively tested. -------------------------------------------------------------------------- Installation Microsoft Windows From the download page, download and run the P4V installer. The P4V installer includes P4Merge. macOS From the Perforce download page, option-click the P4V Download icon and save the file to disk. To install P4V and P4Merge, double-click the downloaded file. P4Merge is included in the P4V.dmg file. To run P4Merge from the command line, issue the following command: /p4merge.app/Contents/Resources/launchp4merge Note: The launchp4merge command-line binary must be run from the above location. You can create a link, alias or shell script that points to this location. Unix From the download page, right-click the P4V Download icon and save the p4v.tgz installation file to disk. P4Merge is included in the p4v.tgz, packaged in a compressed tar file. For example: $cd /foo $gunzip p4v.tgz $tar xvf p4v.tar $ln -s foo/p4v-2010.2-123456/bin/p4merge /usr/local/bin/p4merge p4merge Note: All files passed to P4Merge on the command line must be existing files or an error will occur citing the non-existing file as invalid. -------------------------------------------------------------------------- Interoperating With Previous Releases You can use this version of Helix P4Merge with any Helix Core Server at Release 2019.2 or higher. The functionality available in Helix P4Merge depends on the server version as well as the Helix P4Merge version. In the following change descriptions, the asterisks indicate whether you must upgrade Helix P4Merge or the Helix Core Server as follows: ** -- requires new p4d Helix Core Server program -------------------------------------------------------------------------- Known Limitations On windows Japanese systems use code page 932. CP932 is Microsoft's extended version of ShiftJis; it also includes the NEC special characters. When using ShiftJis on Windows, you have to instruct Qt 4.8.+ to use CP932 and the extension, instead of plain ShiftJis, to avoid mojibake. You need to set the following environment variable: UNICODEMAP_JP=cp932,nec-vdc Then when Helix P4V or Helix P4Merge runs, it will use the modified ShiftJis (CP932) implementation, and apply the extension to recognize NEC special characters when encoding/decoding characters. -------------------------------------------------------------------------- Known Image Diff Problems Bug #40137 The image diff highlight feature is a very resource intensive operation since it compares every pixel between the images. Depending on the user's machine resources, they could experience a slowdown and/or hang if the highlight feature is used in very large images or the machine used has limited resources. Bug #29477 When diffing 48-bit color .TIFF files (16 bits for each channel r/g/b), the image depth is reported to be 32 bits. Bug #29587 When diffing .GIF files, the image depth is always reported to be 32 bits. Bug #29497 Only RGB formatted files are supported in the image diff tool. If a CMYK formatted file is diffed, its format is reported as RGB. -------------------------------------------------------------------------- Supporting Libraries for 2024.3 Update 2 (2024.3/2672664) (2024/10/24) Qt 6.5.3 OpenSSL 3.0.15 ICU 68.1 Helix Core C/C++ API 2024.1.2661979 -------------------------------------------------------------------------- Bugs fixed in 2024.3 Update 2 (2024.3/2672664) (2024/10/24) #122801 (Change #2663327) Fixed a bug where P4Merge was not saving user preferences. -------------------------------------------------------------------------- Supporting Libraries for 2024.3 Update 1 (2024.3/2656785) (2024/09/23) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2024.1.2655224 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2024.3 (2024.3/2649657) (2024/09/06) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2024.1.2624184 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2024.2 Update 3 (2024.2/2634463) (2024/08/05) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2024.1.2624184 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2024.2 Update 2 (2024.2/2625760) (2024/07/18) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2024.1.2624184 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2024.2 Update 1 (2024.2/2619912) (2024/07/01) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2024.1.2596294 -------------------------------------------------------------------------- Bugs fixed in 2024.2 Update 1 (2024.2/2619912) (2024/07/01) #120038 (Changes #2608222, #2598476, #2608298) P4Merge no longer skips showing some lines of content when the file contains double-byte characters. -------------------------------------------------------------------------- Supporting Libraries for 2024.2 (2024.2/2606884) (2024/06/03) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2024.1.2596294 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2024.1 Update 1 (2024.1/2591061) (2024/04/30) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2023.2.2578891 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2024.1 (2024.1/2573667) (2024/03/18) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2023.2.2563409 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2023.4 Update 1 (2023.4/2558838) (2024/02/21) Qt 6.5.3 OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2023.2.2535420 -------------------------------------------------------------------------- Bugs fixed in 2023.4 Update 1 (2023.4/2558838) (2024/02/21) #119557 P4Merge (MacOS) has been updated to use Qt 6.5.3 and OpenSSL 3.0.12, which includes the latest security fixes. -------------------------------------------------------------------------- Supporting Libraries for 2023.4 (2023.4/2534624) (2023/12/18) Qt 6.5.3 (Windows, Linux) 6.3.1 (MacOS) OpenSSL 3.0.12 ICU 68.1 Helix Core C/C++ API 2023.2.2534008 -------------------------------------------------------------------------- New functionality in 2023.4 (2023.4/2534624) (2023/12/18) #118651 (Change #2503260) P4Merge (Windows and Linux) and has been updated to use Qt 6.5.3 and OpenSSL 3.0.12, which includes the latest security fixes. -------------------------------------------------------------------------- Bugs fixed in 2023.4 (2023.4/2534624) (2023/12/18) #117679 (Change #2503951) Fixed an issue in P4Merge where file content could disappear when using the UTF8 w/BOM encoding. -------------------------------------------------------------------------- Supporting Libraries for 2023.3 (2023.3/2495381) (2023/09/28) Qt 6.3.1 OpenSSL 1.1.1v ICU 68.1 Helix Core C/C++ API 2023.1.2468153 -------------------------------------------------------------------------- Bugs fixed in 2023.3 (2023.3/2495381) (2023/09/28) #117212 (Change #2486487) The lines indicating a deletion of text can now be seen correctly in the dark theme. #116755 (Change #2481869) P4Merge now shows the line as expected for deleted lines. #112906 Fixed an issue in P4Merge where the tab stop didn't match the number spaces in the preferences. -------------------------------------------------------------------------- Supporting Libraries for 2023.2 Update 2 (2023.2/2467475) (2023/07/20) Qt 6.3.1 OpenSSL 1.1.1u ICU 68.1 Helix Core C/C++ API 2023.1.2442900 -------------------------------------------------------------------------- Bugs fixed in 2023.2 Update 2 (2023.2/2467475) (2023/07/20) #116299 (Change #2462911) High ASCII characters and double-byte characters now display correctly in P4Merge. #115956 (Changes #2465488, #2466531) P4Merge correctly writes the BOM when editing UTF-8 with BOM files. #100746 (Change #1700058) Functionality for comparing Microsoft Word documents was introduced in P4Merge 2013.4 ("P4.Combine.URL"). This functionality has been removed and is no longer supported as of the 2015.1 release. -------------------------------------------------------------------------- Supporting Libraries for 2023.2 Update 1 (2023.2/2446649) (2023/05/26) Qt 6.3.1 OpenSSL 1.1.1t ICU 68.1 Helix Core C/C++ API 2023.1.2442900 -------------------------------------------------------------------------- Bugs fixed in 2023.2 Update 1 (2023.2/2446649) (2023/05/26) #115510 (Change #2445370) Fixed an issue where P4Merge would sometimes hide the editing buttons next to the text blocks when scrolling. -------------------------------------------------------------------------- Supporting Libraries for 2023.2 (2023.2/2443448) (2023/05/17) Qt 6.3.1 OpenSSL 1.1.1t ICU 68.1 Helix Core C/C++ API 2023.1.2442900 -------------------------------------------------------------------------- Bugs fixed in 2023.2 (2023.2/2443448) (2023/05/17) #115594 (Change #2437934) Character encoding in P4Merge was broken for character sets other than UTF-8. This has been fixed. #115581 (Change #2437934) Reestablished UTF-16 support in P4Merge. -------------------------------------------------------------------------- Supporting Libraries for 2023.1 Update 1 (2023.1/2419860) (2023/03/16) Qt 6.3.1 OpenSSL 1.1.1t ICU 68.1 Helix Core C/C++ API 2022.2.2407422 -------------------------------------------------------------------------- Bugs fixed in 2023.1 Update 1 (2023.1/2419860) (2023/03/16) #114892 (Changes #2404678, #2413679) Disabled buttons in P4Merge are now easier to distinguish from buttons that are enabled. #114742 (Change #2417510) P4Merge now writes out the correct line endings on Windows. #114625 (Change #2415461) Fixed jittery scrolling on P4Merge with certain files. -------------------------------------------------------------------------- Supporting Libraries for 2023.1 (2023.1/2411289) (2023/02/23) Qt 6.3.1 OpenSSL 1.1.1t ICU 68.1 Helix Core C/C++ API 2022.2.2407422 -------------------------------------------------------------------------- New functionality in 2023.1 (2023.1/2411289) (2023/02/23) #114554 (Change #2384600) This release of P4Merge has been upgraded to use the Qt6 Framework. This allows us to officially support additional platforms, among them is support for Windows 11 and the availability of Universal builds for MacOS. These will provide native support for arm64 processor platforms as well as Intel platforms. Note: Qt6 has high DPI monitor support always enabled on Windows. As a result, when upgrading from a previous version of P4V, some of the existing placement and sizes of dialogs/windows may be reset. You can also adjust the font type and size in Preferences->Fonts->Application font, if you'd like to further customize P4V. -------------------------------------------------------------------------- Bugs fixed in 2023.1 (2023.1/2411289) (2023/02/23) #114072 (Change #2400844) Fixes a startup anomaly where the buttons in the edit pane could appear all clumped at the top of the edit pane. -------------------------------------------------------------------------- Supporting Libraries for 2022.3 Update 2 (2022.3/2412793) (2023/02/28) Qt 5.15.1 OpenSSL 1.1.1t ICU 68.1 Helix Core C/C++ API 2022.2.2407422 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2022.3 Update 1 (2022.3/2408367) (2023/02/15) Qt 5.15.1 OpenSSL 1.1.1t ICU 68.1 Helix Core C/C++ API 2022.2.2407422 -------------------------------------------------------------------------- New functionality in 2022.3 Update 1 (2022.3/2408367) (2023/02/15) #114448 P4Merge has been updated to use OpenSSL 1.1.1t, which includes the latest security fixes. -------------------------------------------------------------------------- Bugs fixed in 2022.3 Update 1 (2022.3/2408367) (2023/02/15) #113455 (Change #2387828) When running in the Dark application color scheme, the background in the p4merge Preferences dialog now matches the dark style. #113342 (Change #2372463) The overview pane now scrolls properly and is in sync with the rest of the diff/merge panes. -------------------------------------------------------------------------- Supporting Libraries for 2022.3/2370885 (2022/11/15) Qt 5.15.1 OpenSSL 1.1.1q ICU 68.1 Helix Core C/C++ API 2022.2.2369865 -------------------------------------------------------------------------- Bugs fixed in 2022.3/2370885 (2022/11/15) #112439 (Change #2347944) Fixed a bug where the P4Merge preferences window might not have fit on small screens. #112422 (Change #2346611) On Windows: Fixed alignment problems when drawing "swooshes" connecting merge content. -------------------------------------------------------------------------- Supporting Libraries for 2022.2 Update 1 (2022.2/2336701) Qt 5.15.1 OpenSSL 1.1.1q ICU 68.1 Helix Core C/C++ API 2022.1.2305383 -------------------------------------------------------------------------- Bugs fixed in 2022.2 Update 1 (2022.2/2336701) #111125 (Change #2332825) P4Merge no longer displays "missing argument" message in console when saving a merged file. #111090 (Change #2333961) Fixed problem in P4Merge where the highlight was not aligned with the text. -------------------------------------------------------------------------- Supporting Libraries for 2022.2 (2022.2/2304646) Qt 5.15.1 OpenSSL 1.1.1n ICU 68.1 Helix Core C/C++ API 2022.1.2285021 -------------------------------------------------------------------------- Bugs fixed in 2022.2 (2022.2/2304646) #110989 (Change #2296633) P4Merge inline diff highlight was not correct at the end of the line for certain fonts. This has been fixed. #100277 (Change #2299870) Fixed a problem where P4Merge could corrupt the merge result if double quotes were included. -------------------------------------------------------------------------- Supporting Libraries for 2022.1/2286077 Qt 5.15.1 OpenSSL 1.1.1n ICU 68.1 Helix Core C/C++ API 2021.2.2273812 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2022.1/2266529 Qt 5.15.1 OpenSSL 1.1.1n ICU 68.1 Helix Core C/C++ API 2021.2.2264565 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2021.4.2/2263543 Qt 5.15.1 OpenSSL 1.1.1n ICU 68.1 Helix Core C/C++ API 2021.2.2252059 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2021.4.1/2227050 Qt 5.15.1 OpenSSL 1.1.1l ICU 68.1 Helix Core C/C++ API 2021.2.2220431 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2021.4/2221352 Qt 5.15.1 OpenSSL 1.1.1l ICU 68.1 Helix Core C/C++ API 2021.2.2220431 -------------------------------------------------------------------------- New functionality in 2021.4/2221352 #106615 (Changes #2202530, #2169209) Added a "Show/Hide Whitespace" button to the toolbar so users can quickly toggle the setting that shows or hides whitespace characters. -------------------------------------------------------------------------- Supporting Libraries for 2021.3.1/2170446 Qt 5.15.1 OpenSSL 1.1.1k ICU 68.1 Helix Core C/C++ API 2021.1.2156517 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2021.3/2164701 Qt 5.15.1 OpenSSL 1.1.1k ICU 68.1 Helix Core C/C++ API 2021.1.2156517 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2021.2/2138880 Qt 5.15.1 OpenSSL 1.1.1k ICU 68.1 Helix Core C/C++ API 2021.1.2126753 No new functionality or bug fixes. -------------------------------------------------------------------------- Bugs fixed in 2021.2/2138880 #105945 (Change #2105823) Fixes to minor issues when highlighting diffs. #101622 Fixed issue when diffing files in P4V where the BOM would sometimes not be included in some of the files causing an extra diff at the top of the file. -------------------------------------------------------------------------- Supporting Libraries for 2021.1.2/2125979 Qt 5.15.1 OpenSSL1.1.1 ICU 68.1 Helix Core C/C++ API 2020.2 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2021.1.1/2085655 Qt 5.15.1 OpenSSL1.1.1 ICU 68.1 Helix Core C/C++ API 2020.2 No new functionality or bug fixes. -------------------------------------------------------------------------- Supporting Libraries for 2021.1/2075061 Qt 5.15.1 OpenSSL1.1.1 ICU 68.1 Helix Core C/C++ API 2020.2 -------------------------------------------------------------------------- New functionality in 2021.1/2075061 #105379 (Changes #2061072, #2060378, #2060377, #2060374, #2060368, #2060365) P4Merge now links with International Components for Unicode (ICU) library version number 68.1 on Linux and Windows platforms. -------------------------------------------------------------------------- Supporting Libraries for 2020.3.1/2060285 Qt 5.15.1 OpenSSL1.1.1 ICU 65.1 Helix Core C/C++ API 2020.2 -------------------------------------------------------------------------- Bugs fixed in 2020.3.1/2060285 #104902 (Changes #2059253, #2056545) Horizontal lines no longer appear when scrolling the edit pane on Windows. #104704 (Changes #2055257, #2054934, #2054934) Merging/integrating files or directories from different depots no longer crashes. -------------------------------------------------------------------------- Supporting Libraries for 2020.3/2048092 Qt 5.15.1 OpenSSL1.1.1 ICU 65.1 Helix Core C/C++ API 2020.2 -------------------------------------------------------------------------- New functionality in 2020.2/1999419 #59349 (Changes #1982365, #1976688, #1967616) P4Merge now supports syntax-highlighting for source code. There is a multicolored tool-button in the toolbar to activate it. In this first release of the feature, custom color schemes are not supported. -------------------------------------------------------------------------- Bugs fixed in 2020.1.1/1966006 #102068 (Change #1957667) Fixed crashed when launching P4Merge from the git mergetool. #92012 (Change #1957667) Fixed intermittent crash when launching the P4Merge tool. -------------------------------------------------------------------------- Bugs fixed in 2020.1/1946989 #100861 The merge file picker again accepts drag and drop of files from the file browser and P4V. -------------------------------------------------------------------------- New functionality in 2018.3 patch1/1719707 #96606 (Changes #1718533, #1713805, #1713805) A new Display preference has been added that allows the user to select the desired icon scale size to be used by P4Merge. The default is calculated based on the primary monitor resolution, but the user can now select a custom scaling in case they want to use P4Merge on a secondary monitor that has a different resolution. -------------------------------------------------------------------------- Bugs fixed in 2018.3 patch1/1719707 #96637 (Change #1715564) The application font on Windows now correctly defaults to the correct system font point size (usually 8pt). -------------------------------------------------------------------------- New functionality in 2018.3/1706936 #96185 Application font can now be set for P4Merge on Windows and Mac. -------------------------------------------------------------------------- Bugs fixed in 2017.3 patch1/1590419 #74295 P4Merge invoked from the command line on Linux no longer displays errors on the console when clicking on Next and Previous Diff. -------------------------------------------------------------------------- NOTE: Prior to 2017.3, release notes were listed by the changelist number. -------------------------------------------------------------------------- Bugs fixed in 2015.1/1233444 #1073713 (Bug #42405) Diff algorithm tunables are now taken into account when set in a client-side P4ENVIRO file. --------------------------------------------------------------------------- Bugs fixed in 2014.3 #993605 (Bug #64959) P4Merge now correctly handles files with a Byte Order Mark (BOM). This solves the problem where two BOMs where being saved to the merged result file. #989338 (Bug #76690) When invoking the command line help (p4merge -h), the window now properly displays the information. -------------------------------------------------------------------------- Bugs fixed in Patch 1 since 2014.2/951414 (GA) #958974 (Bug #75870) Fixed character mangling when connected to a non-Unicode server. The characters no longer appear as black diamonds with question marks. This manifested in multiple places, and in the case of merging, could cause data loss as the saved result of a merge could have corrupted characters. -------------------------------------------------------------------------- Major new functionality in 2014.1 #803191 (Bug #71402) ** Added support for Greek language when character encoding is set to CP1253 or 8859-7. #763401 Added a field for the P4Combine web service url to the Preferences dialog so it can be used in standalone mode. -------------------------------------------------------------------------- Bugs fixed in Patch 1 since 2013.4/760166 (GA) #767730 (Bug #62467) Fixed problem with merge pane buttons incorrectly showing up and, if clicked, possibly causing the application to crash. These buttons should not be rendered anymore. --------------------------------------------------------------------------- Major new functionality in 2013.4 #723901 A rich comparison of Microsoft Word (.docx) files is available from P4Merge through the P4Combine Web Service. After the Perforce administrator sets the "P4.Combine.URL" server property to the P4Combine Web Service URL, P4Merge will compare .docx files. The P4Combine Web Service URL can also be set by a command-line argument as follows: -url A second argument can be used to determine the type of compare: -ct 'compare-parent-child' 'compare-siblings' Compare "Parent-Child" is used to show how a file has changed since its most recent state. Compare "Siblings" can be used when there is no direct relationship between the files being compared. P4Combine is installed as part of a Perforce Commons installation. For information on how to install and setup the P4Combine Web Service see the Commons Administrator's Guide: http://www.perforce.com/perforce/doc.current/manuals/commons-admin/index.html **Notice** P4Merge 2015.1 dropped support for the P4Combine Web Service, which provided a rich comparison of Microsoft Word (.docx) files P4Merge 2018.3 dropped support for the command-line argument: -url --------------------------------------------------------------------------- Bugs fixed in 2013.4 #730435 (Bug #66299) Double-byte whitespace characters in filenames now work properly. #714810 (Bug #24515) Merge will no longer randomly add a newline to the end of merged files where no newline was present in either files. ------------------------------------------------------------------------------- Bugs fixed in Patch 1 since 2013.2/661179 (GA) #673499 (Bug #67250) Fixed preferences not getting saved properly. --------------------------------------------------------------------------- Bugs fixed in 2012.2 #489742 (Bug #57364) SVG files are now recognized as text files, not binary. --------------------------------------------------------------------------- Minor new functionality in 2012.1 #407688 (Bug #17830) When saving the merged results, users will now get a dialog warning them if they have unresolved conflicts. --------------------------------------------------------------------------- Minor new functionality in 2011.1 #333992 (Bug #47083) Added support for Chinese language character encodings: cp936 - Windows Codepage 936 (Simplified Chinese GBK) cp950 - Windows Codepage 950 (Traditional Chinese Big5) #324100, #332117 (Bug #36198) When additional languages are available, users can choose which language to use for the application menus, labels and dialogs. This is set in the Preferences dialog. #322256 (Bug #46050) Added support for diffing images of the following formats: TGA, Photoshop, 3DSMax, and Maya. Maya image diffing requires Maya to be installed. --------------------------------------------------------------------------- Bugs fixed in 2011.1 #348727 (Bug #48250) P4Merge Help menu no longer disabled on Mac OS X 10.5. --------------------------------------------------------------------------- Minor new functionality in 2010.2 #273790 (Bug #26931) A new preference has been added to visualize white space. The option is called "Show tabs and spaces". It shows arrows for tabs and dots for spaces. #266761 (Bug #35304) A new preference has been added to insert spaces instead of a tab character in the merge edit diff pane and the diff edit diff pane. --------------------------------------------------------------------------- Bugs fixed in 2010.2 #278936 (Bug #42224) Warning dialog about replacing contents of the merge result when clicking on base, left or right icons now contains missing "No" button. #274246 (Bug #41852) Passing diff option flags (-db/dw/dl/da) on the command line works correctly again. #240804 (Bug #38217) An empty file is no longer saved if some characters can not be translated by the chosen character encoding. --------------------------------------------------------------------------- Minor new functionality in 2010.1 #236666 (Bug #21199) The file size warning dialog is displayed if the combined size of the files exceeds approximately 10M, increased from 2M. #236458 (Bug #20885, #21199, #24303) New busy bar dialog displayed during long load operations. #236458 (Bug #24303) Removed limit on the size of the files that can be merged or diffed. Depending on the sizes of the files and the client computer's resources, P4Merge might become unresponsive during startup. --------------------------------------------------------------------------- Bugs fixed in 2010.1 #264660 (Bug #40758) Merge edit buttons now align correctly to the diffs when using certain application fonts on Unix. #261650 (Bug #39269, #39995) P4Merge is now drawing diffs correctly for all fonts on Unix. #254805 (Bug #39269) P4Merge no longer selects an arbitrary font on Unix when the font that is initially defaulted to does not exist. #240987 (Bug #38506) Current diff/conflict now centers correctly when switching between Single and Double Diff Layout. #238489 (Bug #36906) Save menu no longer disabled after changing character encoding or comparison method. #238489 (Bug #36338) If files being diffed are deleted after P4Merge is launched, menus that require both files are now disabled. #238037 (Bug #37950) When switching between single and double pane or edit diff mode, the document is scrolled to the correct location. #237893 (Bug #25435, #28928) When there is only one diff or conflict, the next and previous actions will take you to that diff/conflict. #236777 (Bug #20647) When using P4Merge standalone, leading and trailing spaces are ignored when validating files. --------------------------------------------------------------------------- Minor new functionality in 2009.2 #216271 (Bug #35729) UTF-32 character encoding in now supported. --------------------------------------------------------------------------- Bugs fixed in 2009.2 #226528 (Bug #36842) "Save As..." menu is now correctly enabled when merging files. #222913 (Bug #36438) The Paste command has the correct key shortcut in context menus. #222534 (Bug #31455) Contents of the merge edit pane are correctly replaced when selecting base, yours or theirs by clicking on the merge diagram. #219519 (Bug #35901, #34890) P4Merge no longer crashes when diffing/merging certain files with inline differences turned on and inline differences are no longer drawn incorrectly when refreshing. #218908 (Bug #35181) Diagram buttons at the top of the P4Merge window in merge mode are clickable again. #218871 (Bug #35889) Command line output for help, version and errors can now be translated. -------------------------------------------------------------------------- Major new functionality in 2009.1 #194848 (Bug #17442) P4Merge now enables you to edit files being diffed, if files are writable. --------------------------------------------------------------------------- Minor new functionality in 2009.1 #193530 (Bug #32698) "Compare as text or image?" dialog optionally remembers your choice. #179160 (Bug #31824) Korean language support added with character encoding set to CP949. --------------------------------------------------------------------------- Bugs fixed in 2009.1 #205951 (Bug #34532) Help and Version dialogs now come up correctly when invoked from the command line with -h or -V respectively. #200284 (Bug #33992) Selected text that spans different diff segments is now correctly copied to the clipboard. #199987, #199997 (Bug #33800) On Unix platforms, P4Merge now correctly exits when displaying version information, help or errors on the terminal window. User no longer needs CTRL-C to get back to prompt. #199992 (Bug #31781, #33676) P4Merge no longer hangs on files the contain lots of lines in the same difference segment when inline differences are highlighted in every line. #198812 (Bug #33626) On Windows Vista, P4Merge now correctly displays the text for long lines (> 4096 chars/bytes). #198616 (Bug #33583) After refreshing, P4Merge now scrolls to the top and selects the first difference segment. #197834 (Bug #33463) After changing font size, edit buttons now correctly line up with the text in the merge pane. #197811 (Bug #33478) Inline diffs now redraw correctly after changing the tab spacing. #197612 (Bug #33421) On Macintosh, when the selection in the Merge pane changes, P4Merge now correctly draws all the way to the right. #197154 (Bug #33050) You can now select the last character of the merge pane. #196686 (Bug #32849, #32775) Tab spacing in the merge pane now displays the correct width. #193530 (Bug #32768) P4Merge less frequently mistakes text files for image files and prompts for action when it detects XBM/PBM/PGM/PNM/PPM files. #185117 (Bug #30204) P4Merge no longer scrolls back to the first diff when you minimize and then maximize the window. #169599 (Bug #31436) Image diff file size is now displayed in the correct format. --------------------------------------------------------------------------- Major new functionality in 2008.2 #163385 (Bug #9792) P4Merge can now display in-line differences, which enables you to see white-space (tabs and spaces), non alpha-numeric character, and alphanumeric character differences. --------------------------------------------------------------------------- Minor new functionality in 2008.2 #164397 (Bug #28112) The selected pane is now indicated by a border instead of a change to the background color, to make the selected pane more obvious. --------------------------------------------------------------------------- Bugs fixed in 2008.2 #175417, #180007 (Bug #31632, #31890) In-line differences now show correctly when refreshing files. #171610 (Bug #31360) P4Merge now correctly remembers if the base was visible between sessions. #168755 (Bug #30923, #30926) Horizontal and vertical splitter placements are now correctly saved in the preferences. #165220 (Bug #27857) Edit buttons no longer disappear for a large EOF conflict when scrolled up out of view of the merge pane, then scrolled back down into view. #165220 (Bug #27506) Edit buttons no longer change from compressed to expanded when scrolling in a file. #163205 (Bug #30484) P4Merge now automatically treats files that might be XBM X bitmap files as text when comparing against text files, as images when comparing against other image formats, and prompts you to specify format when comparing against another XBM X bitmap file. #162354 (Bug #29469) When diffing .TIFF files, the horizontal and vertical image resolution is now reported correctly. #159523 (Bug #29420) Warning messages are no longer displayed in the console on UNIX platforms when the Find dialog is invoked. #158878 (Bug #28028, #28502) Focus remains on the Edit pane when you click the edit buttons pane or the overview pane. #157616 (Bug #29589) Image file side-by-side properties pane now displays the beginning of the text when the window is sized smaller than the full text. #157072 (Bug #29369) Image diff highlight slider no longer causes text to be overlapped when increasing the horizontal size of the Viewer Control. #156573 (Bug #29449) Browse for files dialog now displays correct labels. --------------------------------------------------------------------------- Major new functionality in 2008.1 #149390 (Bug #21119) P4Merge adds support for diffing image files. You can diff the following image file types: BMP GIF JPG, JPEG PNG PBM PGM PPM TIFF XBM XPM For details about how to diff images, refer to the P4Merge online help. Note: you can create plugins to add support for other image file types. For technical details, check the Trolltech web site. Known Limitation P4V displays thumbnails for both image files and related file types such as Photoshop and Maya. You can diff images in P4V by dropping one thumbnail on another. However, P4Merge does not support all file types for which thumbnails are displayed. For example, if you drop a Photoshop icon on another Photoshop icon to diff the files, P4Merge determines that the file are not supported types of image files and attempts to diff the files as text. #151214 (Bug #24980) P4Merge now has a full-featured help viewer that includes indexing, searching, bookmarking and printing. --------------------------------------------------------------------------- Minor new functionality in 2008.1 #152294 (Bug #29015) Use Selection for Find added (Mac only) --------------------------------------------------------------------------- Bugs fixed in 2008.1 #191698 (Bug #32854) Entering Control+Return or Control+Enter in the merge results pane now correctly saves just the Return or just the Enter in the merge results file. #191553 (Bug #32841, #32847) P4Merge now displays and saves the correct results when using the backspace or delete key at the top of the file. #191553 (Bug #32833, #32842, #32843, #32844) Dragging and dropping or pasting text at the beginning of the file when cursor is in a different part of the file now correctly displays and saves the merge results file. #191553 (Bug #32832) Partially deleting last lines and reinserting last section now displays and saves the merge results file in correct order. #190740 (Bug #32752) When dragging and dropping text between sections in the merge pane, only affected sections will become editable (gray) and not the sections in between. #190170 (Bug #32765, #32753) Merge pane now correctly updates text and color immediately after a cut and paste operation. #188657 (Bug #32551) The file contents of the merged result now correctly match the edited-then-saved file, after de-selecting last section then inserting new text. #187296 (Bug #32440, #31351) Find next or previous no longer skip matching string. It correctly starts from beginning or end of file where required. #187294 (Bug #32446) Debug messages no longer appear on Unix console when deleting text in the merge pane. #186651, #189578, #192509 (Bug #32363) Undo operation now works correctly after pasting text the top of the file when there is text selected or not. #167815 (Bug #30479) The Find feature is now much faster. #167815 (Bug #30491) When Find dialog comes up, focus is now always placed in the keyword field instead of on the Close button. #160547 (Bug #30206) P4Merge no longer crashes if the user cancels out of the file size warning dialog. #157352 (Bug #29714) CTRL+ keys no longer adds a number to the Edit Merge pane if there is no difference or conflict to scroll to. #155835 (Bug #29495) Character encoding mismatch dialog now contains additional information when diffing unsupported file types. #155377 (Bug #24121, #29440, #29510) P4Merge no longer crashes if file lacks read permission, or a file name or path contains quotes. #154892 (Bug #29348) Character encoding mismatch dialog now has access keys and correct dialog buttons. #154720 (Bug #29333) P4merge no longer crashes on Linux if the Application font and Text Format fonts are identical. #153100 (Bug #29012) P4Merge is brought to the front when invoked from P4V. (Mac only). #152032 (Bug #28415) To avoid conflict with system color preferences, P4Merge now displays the window background as white and foreground text as black. #148444 (Bug #27626) Erase leftover swooshes after deleting all text from edit pane. #148110, #154498 (Bug #28429) P4Merge now correctly uses the tab width specified on the command line. --------------------------------------------------------------------------- Minor new functionality in 2007.3 #140738 (Bug #26895) Shortcut keys are now displayed in the tool bar menu tooltips. #139077 (Bug #17429) The Current difference highlight is now much easier to see. It has a solid line around it instead of having a darker background. #137802 (Bug #26891) Window geometry of the Compare Files dialog is now remembered. #135026, #144054 (Bug #17171, #28029) Users can now drag and drop files into the Compare Files Dialog. #130708 (Bug #27963) GoTo Line dialog now shows the maximum number of lines in the file/pane. --------------------------------------------------------------------------- Bugs fixed in 2007.3 #148946 (Bug #28585) Context sensitive help now works correctly on Mac OS X 10.5. On Mac OS X 10.5 and above, use 'Alt-Command-?' as the Shortcut key combination to launch Context Sensitive Help. (Mac only) #148870 (Bug #21000) On UNIX, P4Merge now has an 'Application Font' preference. #148502 (Bug #28546) P4Merge no longer crashes if the font is set to a very large size. #146957 (Bug #28072) On the Mac, when choosing a different character encoding in the character encoding mismatch dialog, P4Merge no longer ignores the new choice. #146743 (Bug #28195) Scrolling to diffs is no longer animated and it now snaps into place. #146441 (Bug #28293) The UNIX line ending preference is no longer ignored on Windows. #146078 (Bug #27488) Unnecessary compare files dialog no longer displays when starting P4Merge from P4V on the Mac. #146078 (Bug #28072) Character Encoding is now correctly updated after the user chooses a different one from the character encoding dialog on the Mac. #145819 (Bug #28205) Shortcut for "Select All" now functions properly. #145213 (Bug #26923) P4Merge no longer hardcodes the active selection color in its panes, and it now uses the system selection color. The user can now customize the active selection color and P4Merge will use that. #144937 (Bug #28090) When in merge mode, and the document is reloaded by a Refresh, changing the Comparison Method or the Character Encoding, the document now scrolls to the first diff and makes it active. #144237 (Bug #28032) Scrolling in merge pane now works after selecting all text, deleting it and then reloading the text by refreshing the document, changing the character encoding or the comparison method. #142799 (Bug #27844) To be consistent with Mac standards, menus on the Mac no longer have icons. #141817 (Bug #25158) Strike-through line now gets removed when the section is edited. #141817 (Bug #13539) On deleted lines, the strike-through line now draws all the way across from the beginning of the line to the end of the text. #141076 (Bug #26895) Shortcut key for "Refresh All" on the Mac now maps to Control+Option+R. #140923, #143675 (Bug #26484) Tab spacing of 0 is no longer allowed. #139077 (Bug #27624) Selection no longer extends to the end of the pane. It only highlights to the end of the text selected, which is the standard behavior for text selection. #137772 (Bug #26687) Fixed problem where number of files being passed to P4Merge from P4V was being set incorrectly, causing P4Merge to display an error. #130708 (Bug #23543) P4Merge no longer scrolls past the end of the files. #130708 (Bug #21354) When finding text in P4Merge, highlighted "found" entry is now centered in the pane. #130708 (Bug #24748) P4Merge now implements the Mac shortcut of shift-scrollwheel allowing horizontal scrolling. #130708 (Bug #13650, #26103) Block now turns grey when typing or pasting at the end of the merge pane. #130708 (Bug #16134) Typing in merge pane now longer has a delay on large files after deleting all text and start typing. #130708 (Bug #17385) P4Merge now scrolls to the next diff marker when changing comparison method that causes current diff to go away. #130708 (Bug #19651) Vertical scrollbar no longer disappears when changing character encoding in P4Merge. #130708 (Bug #21151) When changing fonts, the line number font no longer changes. #130708 (Bug #21360) Display no longer flickers when scrolling gets near the right side of the document. #130708 (Bug #21461) Highlights no longer appear and disappear depending if line is in window pane's view. #130708 (Bug #21695) The deleted lines are now correctly shown with strikethrough in single pane diff mode. #130708 (Bug #21937) When changing fonts, the middle splitter swoosh and line numbers are no longer out of sync with the selections in the panes. #130708 (Bug #22043) P4Merge window no longer resizes when closing the application. #130708 (Bug #23407) Highlighted text is correctly shown when switching between character encodings. --------------------------------------------------------------------------- Bugs fixed in 2007.2 #130446 (Bug #25298 ) When merging or diffing large files, some Japanese double byte characters could get split in the incorrect place resulting in corrupted characters. This problem has been fixed. #130439, #130558 (Bug #25308) Characters now display correctly after entering the convert/space key in the IME pad. #128843 (Bug #25122) When using the Delete key to edit, Merge results are now saved correctly. #128753 (Bug #24994, #25123) All Asian characters are correctly displayed when selecting and entering text on the same operation. #128188, #130488 (Bug #23738) All Japanese characters are now displayed when using Shift-JIS character set. #127577 (Bug #25103, #25104) When refreshing a file displayed in P4Merge, the size is recalculated, find results and goto lines will be highlighted appropriately. #127335 (Bug #23812) Translation files (.qm) are now loaded from the same directory as the P4Merge executable. #124593 (Bug #23405) P4Merge no longer crashes when changing tab spacing to 0 and the contents of one of the files start with a tab. --------------------------------------------------------------------------- New features in 2007.1 #107598 (Bug #17759) File names are now displayed when in single-pane mode. #107276 (Bug #17997) The next/previous buttons are now always enabled if there is only one diff in the file. Clicking them scroll to the diff. #106451 (Bug #21896) P4Merge now checks to see if the initial character set is okay for all files. If it's not, P4Merge tries the System charset. If the System charset is okay, P4Merge selects System as the default in the Charset confirmation dialog drop-down list to indicate that the files are most likely text and System is a better choice. The Charset confirmation dialog now has a "Yes", "No" and "Cancel" buttons instead of the "Continue..." and "Cancel" buttons. --------------------------------------------------------------------------- Bugs fixed in 2007.1 #123589 (Bug #24812) Larger files with double byte characters are now handled correctly when merging. #121251 (Bug #24060) The text displayed by the -h flag for the command-line help can now properly be translated into non-English languages. This fix applies to Windows and Unix platforms only. #118633 (Bug #22781) Improved the behavior of P4Merge when using multiple displays. There is no longer a limit on the size of the window to the desktop/display. Additionally, there is no longer a resize of the window when moving between displays of different sizes. There is now the ability to restore to a position that spans more than one display. Lastly, there is only a resize on restore to fit the desktop if the prior position is missing (because the second monitor was disconnected). #115338 (Bug #23376) Single-Pane diff mode now correctly displays strikethrough text. #113949 (Bug #21973) P4Merge help images can now be localized. #114643 (Bug #23557) Fixed problem where when there were two windows open, the toolbar buttons in both windows would reflect the state of the *frontmost* window. #114156 (Bug #23430) The correct Help page is displayed when in Merge mode. #111179 (Bug #22995) P4Merge now finds the first instance of the search string, if one of the files began with the search string input. #111178 (Bug #22950) P4Merge now correctly performs a text search using the Find facility with a full search from the top to the bottom of a file. #109126 (Bug #22453 ) Switching between windows in P4Merge is now faster. #108434 (Bug #22313, #22314 ) P4Merge no longer crashes in some instances when finding forward then backward. #108418 (Bug #7975) P4Merge now displays a dialog when you switch views by clicking on the diagram. This dialog asks if you want to replace the Merge result and reminds you that you can choose Undo to go back to a previous version of the Merge result. #107084 (Bug #20648) The taskbar on Unix now displays a P4Merge application icon when P4Merge is running. #107032 (Bug #21191) P4Merge no longer crashes if you remove one of the files and then refresh P4Merge. #106451 (Bug #22032) The system charset that you select in the Charset confirmation dialog is now passed correctly to P4Merge. #105931 (Bug #21699) PageUp, PageDown, End and Home keys now work properly. #103290 (Bug # 21581) The text displayed for the Comparison Method and Character Encoding menus can now properly be translated into non-English languages. #103093 (Bug #21591) On Windows, ESC no longer closes the main P4Merge application window. #101533 (Bug #21161) In P4Merge, changing the character encoding no longer loses the current diff selection in merge mode. --------------------------------------------------------------------------- New features in 2006.1 #96922 (Bug #18090) P4Merge now allows up to 10 MB of combined file size limit. Users will get a warning if the combined file size is between 2MB and 10MB, but will be allowed to continue if they choose to do so. #95914 (Bug #15307) Additional properties now exist in the Info.plist file in Macintosh OS X products. You can inspect Version information in the Finder as well as look for the bundle using CFBundleSignature and CFBundleIdentifier. #95405 (Bug #10420) In diff and merge modes, P4Merge can now be refreshed. In diff mode, you can refresh and re-diff files without restarting the P4Merge window. In merge mode, if the merged result has been modified, a warning prompt is displayed, stating that, if you refresh, all edits will be lost. #93210, #99919, #99993 (Bug #20019, #20973) P4Merge now detects if the charset does not match the files being merged, and displays a "Continue?" prompt. Improvements made to the user interface: #95288, #95426 , #95431 (Bug #17789, #20056) In the Choose Files and Preferences Dialog, the "Enter" or "Return" keys now accept the highlighted choice. #94526, #94706 (Bug #15063, #17866, #18506) P4Merge now displays merge file titles based on context: if invoked standalone, it displays Left/Right, if invoked from P4V's Resolve dialog, it displays Source/Target or Yours/Theirs. #89587 (Bug #18908) ESC key now closes the Choose Files and the Preferences dialogs on Windows. #87488 (Bug #17330) P4Merge now correctly handles dragging of windows to secondary displays of different resolution and dynamic changes to screen resolution. #86957 (Bug #18151, #18153, #18216) Save/Restore of window size and positions on multiple monitor systems are now remembered. --------------------------------------------------------------------------- Bugs fixed in 2006.1 #106096 (Bug #21178) Scrollbars now adjust correctly when changing the font or tab width. #105513 (Bug #21068) P4Merge could get into an endless loop and crash when scrolling horizontally using the scrollbar. #105439 (Bug #21178) It is now possible to horizontally scroll to the end of lines that contained a lot of whitespace and tabs. Horizontal.scrollbar now adjusts correctly when changing tab width and font. #105210 (Bug #19555) P4Merge now accepts the "System" character set in the command line. It is specified as "-C none". #104502 (Bug #21733) Colors in P4Merge are now getting drawn correctly when scrolling. #104424 (Bug #21598) Swooshes in the splitters in P4Merge and diff tools no longer disappear when using the find or the goto dialog. #103058, 103319 (Bug #21562, #21563) Corrected condition where custom editing of the merge results file could strip line endings and cause incorrect results to be saved. #103037 (Bug #21162) Copy/Cut text now placing selected text in clipboard correctly. #102244 (Bug #21406) Merge results file names with Japanese characters can now be saved. #101534 (Bug #21310, #21311) Line numbers and text now align and refresh correctly. #101533 (Bug #21290) Changing comparison methods or refreshing no longer scrolls to the top of the document. #101403 (Bug #21265) Current diff now correctly centered on the display. #101374, #101583 (Bug #21285) Line number background color now matches the current diff. #101117 *, #101239 (Bug #21257)* Swooshes between diffs and in merge pane now present smoothly. #101032, #101039, #101050 (Bug #21250) P4Merge process now exits properly when user selects Cancel from the dialogs. #100973 (Bug #21166) Line ending settings passed from the command line, P4V or P4Win are now correctly recognized. #96592, #98600 (Bug #20691) P4Merge/Mac no longer crashes when running on unsupported versions of Mac OS X. It instead shows a message to the user and exits gracefully. #96190 (Bug #20471) When opened from P4V, P4Merge sets the left pane to receive focus. It also no longer shows an empty window when resizing. #96068 (Bug #20406) P4Merge now tries to continue even if it encounters parameters it does not understand. An error message is displayed if a parameter cannot be processed. In prior releases, P4Merge failed silently when called from P4V with invalid parameters. #95721 (Bug #18904) In P4Merge you can no longer launch the Goto dialog while the Find dialog is displayed. #95685 (Bug #19009) The preference dialog no longer appears in the Windows Task Bar. #95560 (Bug #19440) P4Merge now tabs correctly to the Merge pane and focus is placed at the top of the pane. #95469 (Bug #19298) On Macintosh, P4Merge no longer crashes on exit if a second P4Merge instance is started from the command line. #95457 (Bug #20148) On Macintosh, P4Merge buttons are appropriately disabled in the P4Merge window after additional P4Merge windows are opened. #95426, #95431 (Bug # 20056) The Preferences Dialog, OK and Cancel buttons now display in the correct order for Microsoft Windows. #95376 (Bug #20427)* P4Merge successfully docks and moves the toolbar. #95249 (Bug #17217) Tab order now behaves correctly on the Choose Files Dialog. #94808 (Bug #19426, #20147) P4Merge no longer shows an extra blank line at the end of each file. #94744 (Bug #20303) P4Merge window title now displays correct file information. #94145 (Bug #19936) Single Pane Diff mode supports using the Find Dialog. #93606 (Bug #20069) P4Merge buttons correctly refresh after changing comparison methods. #92187 (Bug #19439) P4Merge correctly saves the toolbar "visible/invisible" setting. #89618 (Bug #19477) Command line merge recognizes encoding preferences. #89590 (Bug #19080) Filenames display correctly in the P4Merge title bar. The revision displays after the file extension. --------------------------------------------------------------------------- New features in 2005.2 #85515 (Bug #18644) P4Merge now supports additional character sets including UTF-16. The new character sets are: Unicode: UTF-8 (BOM) UTF-16 with Little and Big Endian formats with or without a Byte-Order-Mark Cyrillic: ISO 8859-5 KOI8-R WinAnsi 1251 #84432 (Bug #15062) The edit buttons in the merge pane have tooltips. #83482 (Bug #17208) P4Merge now supports the following command line parameters: Options: The following three options are mutually exclusive: -db Ignore line ending and whitespace length differences -dw Ignore line ending and all whitespace differences -dl Ignore line ending differences -tw -le 'mac' 'win' 'unix' -C Unicode: 'utf8' 'utf8-bom' (UTF-8 with a Byte-Order Mark [BOM]) 'utf16' (UTF-16 with the default byte-order with a BOM) 'utf16-nobom' (UTF-16 default byte-order ) 'utf16be' (UTF-16 big-endian byte-order) 'utf16be-bom' (UTF-16 big-endian byte-order with BOM) 'utf16le' (UTF-16 little-endian byte-order) 'utf16le-bom' (UTF-16 little-endian byte-order with a BOM) Western European: 'iso8859-1' 'winansi' (Windows code page 1252) 'macosroman' 'iso8859-15' Japanese: 'shiftjis' 'eucjp' Cyrillic: 'iso8859-5' 'koi8-r' 'cp1251' (Windows code page 1251) #85982 (Bug #18285) The help window in P4Merge remembers its last position and size. #82736 (Bug #17626) P4Merge now saves the position of splitters and whether the base file is displayed. #82585 (Bug #17761) P4Merge now saves the preference of whether diff is in "single" or "double" pane mode. #82228 (Bug #7231) You can jump to a specific line using a "Go To" dialog. #82069 (Bug #7232) You can display line numbers in read-only fields. #81791 (Bug #7893) You can now search through the text in merge and diff modes. --------------------------------------------------------------------------- Bugs fixed in 2005.2 #120469 (Bug #24380) Using Input-Method Editing by starting with a selection would cause the output file to not match the text input. #92521 (Bug #19787) Extra CR added to files when saving with Windows Line-Endings and UTF-8. #91648 (Bug #19869) P4Merge no longer crashes when started from the command line with relative file paths and the P4Merge application is already running. #91527 (Bug #19787) Extra CR added to files when saving with Windows Line-Endings. #90154 (Bug #19477) Command line merge recognizes encoding preferences. #89841, #89630 (Bug #19441) No longer crashes when opening files that have an exclusive read-lock due to being opened by another application. #85685 (Bug #17429) Current difference highlight is a bit darker so it's more visible on LCD screens. #86189 (Bug #18844, #20765) Merge would wrongly duplicate a common insert in some cases. #85633 (Bug #18357) Text remains readable regardless of the color settings. #84530 (Bug #18304) P4Merge now saves the "toolbar visible/invisible" setting. #84539 (Bug #18324) Clicking in the read-only fields no longer causes all the text fields to scroll to the left. #84336 (Bug #18539) Consolidated Show and Hide actions under one menu called View->Show/Hide. Changed Find menu to Search. #83788 (Bug #18249) P4Merge now displays the correct version message for the command line on Unix platforms. #82543 (Bug #17785) P4Merge error message labels now match the file labels in the "Choose Files" dialog. #80986 (Bug #17558) CTRL+2 no longer adds a 2 to your code if there is no difference to scroll to. #78256 (Bug #17270, #17271) Large files now handled correctly. #77177 (Bug #17090) P4Merge now breaks up the undo history of edits after the file is saved. #77174, #79009, #79108, #78977 (Bug #17131, #17430, #17431) Fixed miscellaneous drawing problems such as displaying correct colors, refresh highlighting and horizontal scrolling. --------------------------------------------------------------------------- New features in 2005.1 #70411 (Bug #15149) P4Merge can now be used from P4Win, making it a viable alternative to P4WinMerge and P4Diff. #69096 (Bug #7888) P4Merge now runs as a standalone merge tool. P4Merge now accepts command-line parameters and can be used from non-Perforce applications. #38483 (Bug #8636) Users can now use keyboard commands to move to the next or previous conflict/diff. P4Merge now has a Preferences dialog, which includes the following: #74744 (Bug #16550) Character encoding preference in P4Merge allows user to select character encoding set to use with selected file. #74367 (Bug #16401) Line ending preference for merge files allows users to select different line ending options when merging files using P4Merge: Windows (CRLF), Mac (CR), or Linux (LF). #69998 (Bug #16520) Font preference. Users can now change font style and size used by P4Merge. #69971 (Bug #14930) Tab spacing and whitespace preferences. Allows users to select the desired comparison method: recognizing or ignoring line endings and/or white space differences. --------------------------------------------------------------------------- Bugs fixed in 2005.1 #84188 (Bug #18504) Fixed bug where clicking the edit buttons could case memory instability. #78985 (Bug #17262) The P4Merge window position and size is now saved. #78256 (Bug #17270, #17271) A dialog has been added to alert the user of file size limitations when diffing or merging large files. #78092 (Bug #17261) Giving a directory instead of a file path in the "Choose Files" dialog no longer crashes P4Merge. #77175 (Bug #17066) The command line help output has been corrected. #74744 (Bug #10989) Can now diff workspace vs. head in P4Merge when file contains bullet (Option-8) characters on Mac OS X. #70085 (Bug #10777) P4Merge now handles files up to 100,000 lines.