Need help cloning? Learn how to
clone a repository.
is a free Git and Mercurial client for Windows.
is a free Git and Mercurial client for Mac.
Add support for merging. Proposed name: AuIntegrate.
Also check out what and why https://github.com/dirkwallenstein/vim-conflict-slides is doing. It may be a source of inspiration.
Start merge branch that will eventually contain merge and histedit implementations
→ <<cset 765536ac361f>>