Tools for diffing and merging of Jupyter notebooks.

A better Vimdiff Git mergetool

🍰 Efficient way of using Vim as a Git mergetool

A Kakoune-based mergetool for Git

vim wrapper for merges

Resolving conflict merges with ASTs

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

Bill of material merge utility.

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.

use emacs as git mergetool

Rails-inspired generator system that provides scaffolding for your apps

Investigating diff tool moved block detection capabilities. See branches.

Using Emacs Ediff as Git Merge/Difftool