mergetool

Tools for diffing and merging of Jupyter notebooks.

Live code review for Neovim with VSCode style diffs

A better Vimdiff Git mergetool

🍰 Efficient way of using Vim as a Git mergetool

Terminal-native 3-way git mergetool and diff viewer

unified diff viewing experience in Neovim; local diffs, merge conflicts, GitHub PR review

A Kakoune-based mergetool for Git

Using Emacs Ediff as Git Merge/Difftool

VS Code extension for open merge tool of intellij

GNOME/meld ported to a VS Code Extension

A GUI to open and configure Unity YAML Merge

vim wrapper for merges

Merge images folders from scanlations and raws mangas, useful when the manga doesn't have an official translation

Resolving conflict merges with ASTs

Diff Multiplexer - A TUI mergetool

use emacs as git mergetool

Bill of material merge utility.

The modern, customizable Linux diff and merge experience. Compare files and folders - plus images, documents, tables, and web pages - with synchronized side-by-side views, .gitignore-aware recursive folder sync, reusable profiles, and safe three-way merge, all powered by Rust, Qt 6, and Kirigami.

A quick reference or brief documentation as a summary of git commands and some handy tools & guides that are used in hands-on situations and improves the git knowledge. As well as GitSwitcher: a script that switches between git branches in an easy manner without typing any git command.

Investigating diff tool moved block detection capabilities. See branches.