18 Forks
361 Stars
361 Watchers

diffconflicts

A better Vimdiff Git mergetool

How to download and setup diffconflicts

Open terminal and run command
git clone https://github.com/whiteinge/diffconflicts.git
git clone is used to create a copy or clone of diffconflicts repositories. You pass git clone a repository URL.
it supports a few different network protocols and corresponding URL formats.

Also you may download zip file with diffconflicts https://github.com/whiteinge/diffconflicts/archive/master.zip

Or simply clone diffconflicts with SSH
[email protected]:whiteinge/diffconflicts.git

If you have some problems with diffconflicts

You may open issue on diffconflicts support forum (system) here: https://github.com/whiteinge/diffconflicts/issues

Similar to diffconflicts repositories

Here you may see diffconflicts alternatives and analogs

 gogs    fzf    hub    phabricator    awesome-cheatsheets    gitsome    blog    github-cheat-sheet    issues    curriculum    gitignore    tips    git-extras    diff-so-fancy    gitea    husky    ungit    git-recipes    gitbucket    libgit2    tig    git-lfs    decap-cms    desktop    pure    git-standup    githug    legit    docker-gitlab    vim-gitgutter