syntax highlighting without unnecessary gestures.

DiffMerge, by default, does not support syntax highlighting of programming languages.

there are problems when working with the Cyrillic alphabet.

no syntax highlighting without additions.

with different encodings it works fine.

This tool was most likely encountered by both git users and users of the mercurial system, however, a couple of lines will not hurt. Under the cut you will also find examples of Git settings for use with DiffMerge and WinMerge for Windows. In order to make up for the lack of information on the hub, I decided to write this mini-review.

In this regard, the question arose of revising the arsenal of tools, in particular the issue of choosing a toolvisual comparison and merge (diff and merge). I recently “jumped” from mercurial (which I still consider more convenient and logical) to git, because, the vast majority of projects that I am interested in use git and are hosted on github. But there was practically no information about visual comparison tools and the resolution of merge conflicts. There have also been discussions of IDE plugins for working with git and mercurial.

On a habr already there were many articles about the distributed version control systems ( DVCS ), their comparisons, and also comparisons of GUI clients for them.

Winmerge git compare directories