diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:19 -0700 |
| commit | 173368d73da792663358dea5b878cc822511001e (patch) | |
| tree | 8435a23264c4ed38b5172ff401b15905294cd9c2 /t/t6432-merge-recursive-space-options.sh | |
| parent | Merge branch 'js/advise-when-skipping-cherry-picked' (diff) | |
| parent | cherry-pick: use better advice message (diff) | |
| download | tgif-173368d73da792663358dea5b878cc822511001e.tar.xz | |
Merge branch 'zh/cherry-pick-advice'
The advice message that "git cherry-pick" gives when it asks
conflicted replay of a commit to be resolved by the end user has
been updated.
* zh/cherry-pick-advice:
cherry-pick: use better advice message
Diffstat (limited to 't/t6432-merge-recursive-space-options.sh')
0 files changed, 0 insertions, 0 deletions