https://github.com/babobski/tatu-diff-merge

A vscode side by side diff merge plugin
https://github.com/babobski/tatu-diff-merge

diffmerge merge vscode

Last synced: 2 months ago
JSON representation

A vscode side by side diff merge plugin

• Host: GitHub
• URL: https://github.com/babobski/tatu-diff-merge
• Owner: babobski
• Created: 2021-02-27T15:38:00.000Z (almost 4 years ago)
• Default Branch: master
• Last Pushed: 2023-12-10T18:02:42.000Z (about 1 year ago)
• Last Synced: 2023-12-11T18:42:51.518Z (about 1 year ago)
• Topics: diffmerge, merge, vscode
• Language: JavaScript
• Homepage: https://marketplace.visualstudio.com/items?itemName=babobski.tatu-diff
• Size: 1.38 MB
• Stars: 3
• Watchers: 1
• Forks: 1
• Open Issues: 1
• Metadata Files:
  • Readme: README.md
  • Changelog: CHANGELOG.md

Awesome Lists containing this project

README

        
# tatu-diff-merge

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.

![Preview](images/preview.jpg)

## 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

![Context menu](images/context-menu.jpg)

## 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](https://highlightjs.org/static/demo/).  

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.