Stefan Haller ba160cb5db Add test for a pick that fails and gets rescheduled ... This test is interesting because it already behaves as desired: since git has rescheduled the "pick" command, we do _not_ want to show a "conflict" entry in this case, as we would see the same commit twice then.		2023-06-22 18:57:43 +02:00
..
advanced_interactive_rebase.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
amend_commit_with_conflict.go	Add test for amending a commit, causing a conflict	2023-06-22 18:57:43 +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
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_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	Extend test to expect what commits we want to be listed when there's a conflict	2023-06-22 18:57:43 +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.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