Tatu diff merge is a side by side diff viewer with merge capabilities.
It allows to quickly merge from the clipboard or against a file and file on disk.
main features
The main functions are available trough the context menu of the current file.
diff/merge with clipboard
diff/merge with file
diff/merge with file on disk
Key bindings
When you have the Diff window open, there are some shortcuts you can use.
↓ Scroll and select next diff
↑ Scroll and select previous diff
→ Merge selected lines
Backspace Delete selected lines
Esc Close diff window
Shift + mouse click Select multiple lines
Ctrl + s or for mac users ⌘ + s Save result (and close the diff)
Ctrl + c or for mac users ⌘ + c Copy selected lines from the left diff
Ctrl + z or for mac users ⌘ + z Undo last action
Double click right side: Enter edit mode
Return In edit mode, save result
Syntax highlighting
From the 1.0.0 release, support for syntax highlighting is added.
It does not support vscode highlighting, but it does support all 242 color schemes from highlight.js.
You can configure this in the settings, if you don't want syntax highlighting.
You can set it to 'none' in the settings.
Edit mode
From the 1.0.0 release you are able to edit the result side.
When you double click on the line you want to edit, you are able to edit the right side.
When you press enter or the element get's focused out, the result will be saved.
