#

mergetool

Here are 14 public repositories matching this topic...

jupyter / nbdime

Tools for diffing and merging of Jupyter notebooks.

git diff jupyter version-control jupyter-notebook mercurial merge vcs diffing hg mergetool merge-driver jupyterlab-extension

Updated Jun 29, 2022
Python

whiteinge / diffconflicts

A better Vimdiff Git mergetool

git vim vim-plugin vimdiff mergetool

Updated Apr 25, 2022
Vim script

samoshkin / vim-mergetool

🍰 Efficient way of using Vim as a Git mergetool

git vim merge-conflicts diff vim-plugin vimdiff mergetool

Updated Sep 7, 2020
Vim script

lenormf / kakmerge

A Kakoune-based mergetool for Git

git script merge kakoune 3-way-merge mergetool

Updated Jan 26, 2021
Shell

nomi9995 / intellij-merge-tool

VS Code extension for open merge tool of intellij

intellij merge vscode-extension mergetool

Updated Mar 15, 2021
TypeScript

paulotome / emacstool

Using Emacs Ediff as Git Merge/Difftool

git shell emacs mergetool difftool

Updated Jan 6, 2020
Shell

TheRaphael0000 / diff_and_merge_raw_translation

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

diff manga image-diff mergetool scanlation imagehash raws

Updated Jun 22, 2022
Python

agriffis / vimmerge

vim wrapper for merges

git vim diff merge vimdiff mergetool git-mergetool

Updated Mar 22, 2018
Shell

ishansaksena / Conflerge

Resolving conflict merges with ASTs

git merge-conflicts tokenization abstract-syntax-tree mergetool

Updated Mar 18, 2017
Java

robatwilliams / diff-hero

Investigating diff tool moved block detection capabilities. See branches.

diff mergetool difftool

Updated Jan 20, 2019
JavaScript

hossam-magdy / GitSwitcher

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.

git tree git-flow git-workflow upstream plaintext conflict mergetool staging-area difftool uncommitted-changes

Updated Dec 3, 2017
Shell

asterix24 / MergeBom

Bill of material merge utility.

python components electronics bom fancy mergetool altium-designer

Updated Sep 9, 2021
Python

clayrisser / emacs-mergetool

use emacs as git mergetool

git emacs merge mergetool

Updated May 15, 2019
Shell

ekisoffi / generator

Rails-inspired generator system that provides scaffolding for your apps

Updated Jan 8, 2018
JavaScript

Improve this page

Add a description, image, and links to the mergetool topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the mergetool topic, visit your repo's landing page and select "manage topics."