mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
5116eab70b
"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) |
||
---|---|---|
.. | ||
.gitattributes | ||
git-completion.bash | ||
git-completion.tcsh | ||
git-completion.zsh | ||
git-prompt.sh |