Stefan Haller 1998d0724f Add a test for stopping at an "edit" command that conflicts ...

This test is almost identical to swap_in_rebase_with_conflict.go, except that it
sets the commit that will conflict to "edit".

This test is interesting because there's special code needed to determine
whether an "edit" command conflicted or not, i.e. whether to show the "confl"
entry. In this case we do. We have lots of other tests already that have "edit"
commands that don't conflict, so that's covered already.

2023-06-22 18:57:58 +02:00

..

advanced_interactive_rebase.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

amend_commit_with_conflict.go

Insert fake todo entry for a conflicting commit that is being applied

2023-06-22 18:57:58 +02:00

amend_first_commit.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

amend_fixup_commit.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

amend_head_commit_during_rebase.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

amend_merge.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

amend_non_head_commit_during_rebase.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

drop_todo_commit_with_update_ref_show_branch_heads.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

drop_todo_commit_with_update_ref.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

edit_first_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

edit_non_todo_commit_during_rebase.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

edit_the_confl_commit.go

Insert fake todo entry for a conflicting commit that is being applied

2023-06-22 18:57:58 +02:00

fixup_first_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

fixup_second_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

move_in_rebase.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

move.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

pick_rescheduled.go

Add test for a pick that fails and gets rescheduled

2023-06-22 18:57:43 +02:00

rebase.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

reword_commit_with_editor_and_fail.go

Add test for rewording a commit and failing with an error

2023-06-22 18:57:43 +02:00

reword_first_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

reword_last_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

reword_you_are_here_commit_with_editor.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

reword_you_are_here_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

shared.go

Insert fake todo entry for a conflicting commit that is being applied

2023-06-22 18:57:58 +02:00

squash_down_first_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

squash_down_second_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

squash_fixups_above_first_commit.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

swap_in_rebase_with_conflict_and_edit.go

Add a test for stopping at an "edit" command that conflicts

2023-06-22 18:57:58 +02:00

swap_in_rebase_with_conflict.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00

swap_with_conflict.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00