|
1 | 1 | ComparePlus plugin for Notepad++
|
2 | 2 | ------------
|
3 | 3 |
|
4 |
| -A very useful diff plugin to show the difference between: |
5 |
| -- 2 files (side by side) |
6 |
| -- Diff against Git (with the help of [libgit2](https://github.com/libgit2/libgit2) ) |
7 |
| -- Diff against SVN (with the help of [sqlite](https://sqlite.org) ) |
8 |
| -- Diff since last Save |
| 4 | +ComparePlus is a plugin for Notepad++ that allows the user to: |
| 5 | + |
| 6 | +- Compare two files and show differences side by side |
| 7 | +- Compare only parts (selections) of two files |
| 8 | +- Find unique lines between two files |
| 9 | +- Diff a file against Git (with the help of [libgit2](https://github.com/libgit2/libgit2) ) |
| 10 | +- Diff a file against SVN (with the help of [sqlite](https://sqlite.org) ) |
| 11 | +- Diff a changed file since it was last saved |
| 12 | +- Diff a file or parts of it against clipboard text content |
| 13 | + |
| 14 | +It is highly customizable, can ignore spaces, empty lines, letter cases, regexes, can find moves and show character diffs. |
| 15 | +Several compared file pairs can be active and displayed at the same time. |
| 16 | + |
9 | 17 |
|
10 | 18 | Build Status
|
11 | 19 | ------------
|
12 | 20 |
|
13 |
| -- AppVeyor `VS2017` [](https://ci.appveyor.com/project/pnedev/compare-plugin) |
| 21 | +- AppVeyor [](https://ci.appveyor.com/project/pnedev/comparePlus) |
14 | 22 |
|
15 |
| -Build ComparePlus plugin for Notepad++ from source: |
16 |
| -------------------------------- |
17 |
| - |
18 |
| - 1. Open [`plugin_compare\compare-plugin\projects\2017\ComparePlus.vcxproj`](https://github.com/pnedev/compare-plugin/blob/master/projects/2017/ComparePlus.vcxproj) |
19 |
| - 2. Build ComparePlus plugin [like a normal Visual Studio project](https://msdn.microsoft.com/en-us/library/7s88b19e.aspx). Available platforms are x86 win32 and x64 for Unicode Release and Debug. |
20 |
| - 3. CMake config is available and tested for the generators MinGW Makefiles, Visual Studio and NMake Makefiles |
21 | 23 |
|
22 | 24 | Installation:
|
23 | 25 | ----------
|
24 | 26 |
|
25 |
| -To install the plugin automatically use the Notepad++ PluginAdmin dialog (available since v7.6.3, find it in the `Plugins` menu). |
| 27 | +** ComparePlus plugin is available for Notepad++ versions above v8.4.2 (included) ** |
26 | 28 |
|
27 |
| -To install the plugin manually follow the instructions below based on your current Notepad++ version. |
| 29 | +To install the plugin automatically use the Notepad++ PluginAdmin dialog (find it in the `Plugins` menu). |
28 | 30 |
|
29 |
| -** Important Note: ** ** If you are installing Compare plugin (not ComparePlus) replace all *ComparePlus* names in the instructions below with *ComparePlugin*. Please note that ComparePlus has not been released yet. ** |
| 31 | +To install the plugin manually: |
30 | 32 |
|
31 |
| -7.6.3 and above: |
32 | 33 | 1. Create `ComparePlus` folder in Notepad++'s plugins installation folder (`%Notepad++_program_folder%\Plugins`).
|
33 |
| -2. Copy the contents of the [Latest Release](https://github.com/pnedev/compare-plugin/releases/latest) zip file |
| 34 | +2. Copy the contents of the desired ComparePlus [release](https://github.com/pnedev/comparePlus/releases) zip file |
34 | 35 | into the newly created folder. Please use the correct archive version based on your Notepad++ architecture - x86 or x64.
|
35 | 36 | - ComparePlus.dll : The core plugin DLL.
|
36 | 37 | - ComparePlus sub-folder : Contains the libs libgit2.dll and sqlite.dll needed for the Diff against Git and SVN commands.
|
37 | 38 | 3. Restart Notepad++.
|
38 | 39 |
|
39 |
| -Pre 7.6.0: |
40 |
| -1. Copy the contents of the [Latest Release](https://github.com/pnedev/compare-plugin/releases/latest) zip file |
| 40 | + |
| 41 | +------------------------------- |
| 42 | +** IMPORTANT NOTE: ** |
| 43 | +** This GitHub project is also the home of the latest [source](https://github.com/pnedev/comparePlus/tree/Compare_v2) and [releases](https://github.com/pnedev/comparePlus/releases) of Compare-plugin for Notepad++. ComparePlus is its highly advanced successor and is meant to be its replacement so Compare-plugin will no longer be supported (at least by me) ** |
| 44 | + |
| 45 | +To install Compare-plugin you can either use the Notepad++ PluginAdmin dialog that will it automatically |
| 46 | +or you can do it manually as described in the following steps based on your Notepad++ version: |
| 47 | + |
| 48 | +v7.6.3 and above: |
| 49 | + |
| 50 | +1. Create `ComparePlugin` folder in Notepad++'s plugins installation folder (`%Notepad++_program_folder%\Plugins`). |
| 51 | +2. Copy the contents of the desired Compare-plugin [release](https://github.com/pnedev/comparePlus/releases) zip file |
| 52 | +into the newly created folder. Please use the correct archive version based on your Notepad++ architecture - x86 or x64. |
| 53 | +- ComparePlugin.dll : The core plugin DLL. |
| 54 | +- ComparePlugin sub-folder : Contains the libs libgit2.dll and sqlite.dll needed for the Diff against Git and SVN commands. |
| 55 | +3. Restart Notepad++. |
| 56 | + |
| 57 | +Pre v7.6.0: |
| 58 | + |
| 59 | +1. Copy the contents of the desired Compare-plugin [release](https://github.com/pnedev/comparePlus/releases) zip file |
41 | 60 | into Notepad++'s plugins installation folder (`%Notepad++_program_folder%\Plugins`).
|
42 | 61 | Please use the correct archive version based on your Notepad++ architecture - x86 or x64.
|
43 |
| -- ComparePlus.dll : The core plugin DLL. |
44 |
| -- ComparePlus sub-folder : Contains the libs libgit2.dll and sqlite.dll needed for the Diff against Git and SVN commands. |
| 62 | +- ComparePlugin.dll : The core plugin DLL. |
| 63 | +- ComparePlugin sub-folder : Contains the libs libgit2.dll and sqlite.dll needed for the Diff against Git and SVN commands. |
45 | 64 | 2. Restart Notepad++.
|
46 | 65 |
|
| 66 | + |
| 67 | +To build ComparePlus plugin for Notepad++ from source: |
| 68 | +------------------------------- |
| 69 | + |
| 70 | + 1. Open [`comparePlus\projects\2017\ComparePlus.vcxproj`](https://github.com/pnedev/comparePlus/blob/master/projects/2017/ComparePlus.vcxproj) |
| 71 | + 2. Build ComparePlus plugin like a normal Visual Studio project. Available platforms are x86 win32 and x64 for Unicode Release and Debug. Arm64 build is also available. |
| 72 | + 3. CMake config is available and tested for the generators MinGW Makefiles, Visual Studio and NMake Makefiles |
| 73 | + |
| 74 | + |
47 | 75 | Get ComparePlus plugin for Notepad++ at the web:
|
48 | 76 | -------------------------------
|
49 | 77 |
|
50 |
| -- from GitHub project link [Releases section](https://github.com/pnedev/compare-plugin/releases) |
51 |
| -- manual download of continuous builds from [Appveyor](https://ci.appveyor.com/project/pnedev/compare-plugin/history) |
| 78 | +- from GitHub project [Releases section](https://github.com/pnedev/comparePlus/releases) |
| 79 | +- manual download of continuous builds from [Appveyor](https://ci.appveyor.com/project/pnedev/comparePlus/history) |
| 80 | + |
52 | 81 |
|
53 | 82 | Additional information:
|
54 | 83 | ----------
|
55 | 84 |
|
56 |
| -- ComparePlus plugin for Notepad++ [Contributors](https://github.com/pnedev/compare-plugin/graphs/contributors) |
| 85 | +- ComparePlus plugin for Notepad++ [Contributors](https://github.com/pnedev/comparePlus/graphs/contributors) |
57 | 86 | - See also the [Notepad++ official site](http://notepad-plus-plus.org/) for more information.
|
58 | 87 |
|
| 88 | + |
59 | 89 | Changelog:
|
60 | 90 | ----------
|
61 | 91 |
|
62 |
| -see [`ReleaseNotes.txt`](https://github.com/pnedev/compare-plugin/blob/master/ReleaseNotes.txt) |
| 92 | +see [`ReleaseNotes.txt`](https://github.com/pnedev/comparePlus/blob/master/ReleaseNotes.txt) |
0 commit comments