Text editor
DiffPlug has all the bells and whistles you’d expect from a modern text editor.
- Customizable syntax highlighting
- Find and replace, including full regex and incremental search
- Advanced file status monitoring
Toolbar legend
| Action | Icon | Key | Description |
|---|---|---|---|
| Save |  |
[Ctrl S] | Saves this file. |
| File status |  |
[Ctrl Shift S] | Opens the file status for this file. |
| Cut |  |
[Ctrl X] | Cuts text to the clipboard. |
| Copy |  |
[Ctrl C] | Copies text to the clipboard. |
| Paste |  |
[Ctrl V] | Pastes text from the clipboard. |
| Undo |  |
[Ctrl Z] | Reverses the most recent change. |
| Redo |  |
[Ctrl Y] | Re-applies the change which was most recenly undone. |
| Reload |  |
[F5] | Reloads the file. |
| Config |  |
[F12] | Opens the config dialog. |
Config
- Syntax determines what syntax highlighting rules are being applied.
- The Syntax Manager can be used to setup custom syntax highlighting rules.
- Show whitespace displays space characters as grey dots, and tab characters as grey chevrons.
Text differ
The text differ has three areas.
- Text diff (center)
- This displays the diffed text. A yellow background indicates areas that have changed, and a grey background indicates areas which do not exist on that side of the file. A red highlight is applied to the currently selected conflict.
- Minimap (far left)
- This displays a minimap of the entire diff. You can click anywhere in the minimap to scroll the view to where you clicked.
- Within-line diff (bottom)
- This displays a character-by-character diff of the currently selected line.
For now, the only way to resolve a conflict in a text file is to use the Copy to left 
and Copy to right 
actions (see toolbar legend below). You cannot make arbitrary edits. This is an open issue, and we are working on an improvement which will allow you to make any arbitrary edit within a text diff.
Toolbar legend
| Action | Icon | Key | Description |
|---|---|---|---|
| Save | |
[Ctrl S] | Saves these files. |
| File status | |
[Ctrl Shift S] | Opens the file status for these files. |
| First conflict |  |
[Ctrl Shift ↑] | Navigates to the first conflict. |
| Previous conflict |  |
[Ctrl ↑] | Navigates to the previous conflict. |
| Next conflict |  |
[Ctrl ↓] | Navigates to the next conflict. |
| Last conflict |  |
[Ctrl Shift ↓] | Navigates to the last conflict. |
| Copy to left | |
[Ctrl ←] | Copies the right side over the left side for the currently selected conflict. |
| Copy to right | |
[Ctrl →] | Copies the left side over the right side for the currently selected conflict. |
| Undo | |
[Ctrl Z] | Reverses the most recent change. |
| Redo | |
[Ctrl Y] | Re-applies the change which was most recenly undone. |
| Reload | |
[F5] | Reloads the diff. |
| Config | |
[F12] | Opens the config dialog. |
Config
- Syntax determines what syntax highlighting rules are being applied.
- The Syntax Manager can be used to setup custom syntax highlighting rules.
- Show whitespace displays space characters as grey dots, and tab characters as grey chevrons.
- Ignore whitespace when diffing prevents differences in whitespace from marking lines are changed.