diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-24 00:14:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-24 00:14:14 -0800 |
| commit | 768c728e7c706ab8d39e0dbf2aa4d1a465930728 (patch) | |
| tree | a7d70a6b0a276027339339bdd4511f471c700bee /t/t3402-rebase-merge.sh | |
| parent | t9129: skip the last three tests if UTF-8 locale is not available (diff) | |
| parent | rebase -i -p: leave a --cc patch when a merge could not be redone (diff) | |
| download | tgif-768c728e7c706ab8d39e0dbf2aa4d1a465930728.tar.xz | |
Merge branch 'js/rebase-i-p'
* js/rebase-i-p:
rebase -i -p: leave a --cc patch when a merge could not be redone
rebase -i -p: Fix --continue after a merge could not be redone
Show a failure of rebase -p if the merge had a conflict
Diffstat (limited to 't/t3402-rebase-merge.sh')
0 files changed, 0 insertions, 0 deletions