diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 11:11:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 11:11:41 +0300 |
| commit | 05f6e1be8cdae1ebedf3cf7b7a072a3b35f945b5 (patch) | |
| tree | 1312b104cc48f5c06c74fbf5d03ffa95e5a3f618 /t/t5550-http-fetch-dumb.sh | |
| parent | 1d73f8e86d7b4d95e0b7ce53eec2a5f8114722ac (diff) | |
| parent | c7d227df5bf7fe9d5df98a55cd637bfaf38685ea (diff) | |
Merge branch 'cp/merge-continue'
"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'
Diffstat (limited to 't/t5550-http-fetch-dumb.sh')
0 files changed, 0 insertions, 0 deletions