• Junio C Hamano's avatar
    Merge branch 'da/smerge' · 5116eab7
    Junio C Hamano authored
    "git mergetool" learned to offer Sublime Merge (smerge) as one of
    its backends.
    
    * da/smerge:
      contrib/completion: add smerge to the mergetool completion candidates
      mergetools: add support for smerge (Sublime Merge)
    5116eab7
Name
Last commit
Last update
..
buildsystems Loading commit data...
coccinelle Loading commit data...
completion Loading commit data...
contacts Loading commit data...
credential Loading commit data...
diff-highlight Loading commit data...
emacs Loading commit data...
examples Loading commit data...
fast-import Loading commit data...
git-jump Loading commit data...
git-shell-commands Loading commit data...
hg-to-git Loading commit data...
hooks Loading commit data...
long-running-filter Loading commit data...
mw-to-git Loading commit data...
persistent-https Loading commit data...
remote-helpers Loading commit data...
stats Loading commit data...
subtree Loading commit data...
svn-fe Loading commit data...
thunderbird-patch-inline Loading commit data...
update-unicode Loading commit data...
vscode Loading commit data...
workdir Loading commit data...
README Loading commit data...
coverage-diff.sh Loading commit data...
git-resurrect.sh Loading commit data...
remotes2config.sh Loading commit data...
rerere-train.sh Loading commit data...