05f6e1be8c
"git merge --continue" has been added as a synonym to "git commit" to conclude a merge that has stopped due to conflicts. * cp/merge-continue: merge: mark usage error strings for translation merge: ensure '--abort' option takes no arguments completion: add --continue option for merge merge: add '--continue' option as a synonym for 'git commit' |
||
|---|---|---|
| .. | ||
| git-completion.bash | ||
| git-completion.tcsh | ||
| git-completion.zsh | ||
| git-prompt.sh | ||