Change list section headers to a slightly more elegant design

I'm not a skilled UI designer, so I suspect there may be even better
options, but it's definitely already better than the raw ASCII "---" we
had before.

Put the line only at the beginning because it looks bad if the line
after the label is misaligned when labels don't have the same width
(e.g. "Remote" vs. "Local" in the divergence view).

pkg/integration/tests/branch/rebase_and_drop.go

@@ -53,11 +53,11 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Commits().
 			Focus().
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				MatchesRegexp(`pick.*to keep`).IsSelected(),
 				MatchesRegexp(`pick.*to remove`),
 				MatchesRegexp(`pick.*CONFLICT.*first change`),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				MatchesRegexp("second-change-branch unrelated change"),
 				MatchesRegexp("second change"),
 				MatchesRegexp("original"),
@@ -65,11 +65,11 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
 			SelectNextItem().
 			Press(keys.Universal.Remove).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				MatchesRegexp(`pick.*to keep`),
 				MatchesRegexp(`drop.*to remove`).IsSelected(),
 				MatchesRegexp(`pick.*CONFLICT.*first change`),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				MatchesRegexp("second-change-branch unrelated change"),
 				MatchesRegexp("second change"),
 				MatchesRegexp("original"),

pkg/integration/tests/branch/show_divergence_from_base_branch.go

@@ -37,9 +37,9 @@ var ShowDivergenceFromBaseBranch = NewIntegrationTest(NewIntegrationTestArgs{
 			IsFocused().
 			Title(Contains("Commits (feature <-> master)")).
 			Lines(
-				DoesNotContainAnyOf("↓", "↑").Contains("--- Remote ---"),
+				DoesNotContainAnyOf("↓", "↑").Contains("─── Remote"),
 				Contains("↓").Contains("master 3"),
-				DoesNotContainAnyOf("↓", "↑").Contains("--- Local ---"),
+				DoesNotContainAnyOf("↓", "↑").Contains("─── Local"),
 				Contains("↑").Contains("feature 2"),
 				Contains("↑").Contains("feature 1"),
 			)

pkg/integration/tests/branch/show_divergence_from_upstream.go

@@ -44,10 +44,10 @@ var ShowDivergenceFromUpstream = NewIntegrationTest(NewIntegrationTestArgs{
 			IsFocused().
 			Title(Contains("Commits (master <-> origin/master)")).
 			Lines(
-				DoesNotContainAnyOf("↓", "↑").Contains("--- Remote ---"),
+				DoesNotContainAnyOf("↓", "↑").Contains("─── Remote"),
 				Contains("↓").Contains("three"),
 				Contains("↓").Contains("two"),
-				DoesNotContainAnyOf("↓", "↑").Contains("--- Local ---"),
+				DoesNotContainAnyOf("↓", "↑").Contains("─── Local"),
 				Contains("↑").Contains("four"),
 			)
 	},

pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go

@@ -27,8 +27,8 @@ var ShowDivergenceFromUpstreamNoDivergence = NewIntegrationTest(NewIntegrationTe
 			IsFocused().
 			Title(Contains("Commits (master <-> origin/master)")).
 			Lines(
-				Contains("--- Remote ---"),
-				Contains("--- Local ---"),
+				Contains("─── Remote"),
+				Contains("─── Local"),
 			)
 	},
 })

pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go

@@ -60,9 +60,9 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
 			SelectNextItem().
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick CI two"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("     CI one").IsSelected(),
 				Contains("     CI base"),
 			).
@@ -77,9 +77,9 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
 				t.Views().Information().Content(DoesNotContain("commit copied"))
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick CI two"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("     CI three"),
 				Contains("     CI one").IsSelected(),
 				Contains("     CI base"),

pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go

@@ -29,10 +29,10 @@ var AmendWhenThereAreConflictsAndAmend = NewIntegrationTest(NewIntegrationTestAr
 		t.Views().Commits().
 			Focus().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit three"),
 				Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit two"),
 				Contains("file1 changed in master"),
 				Contains("base commit"),

pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go

@@ -33,10 +33,10 @@ var AmendWhenThereAreConflictsAndCancel = NewIntegrationTest(NewIntegrationTestA
 		t.Views().Commits().
 			Focus().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit three"),
 				Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit two"),
 				Contains("file1 changed in master"),
 				Contains("base commit"),

pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go

@@ -44,10 +44,10 @@ var RevertWithConflictMultipleCommits = NewIntegrationTest(NewIntegrationTestArg
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending reverts ---"),
+				Contains("─── Pending reverts"),
 				Contains("revert").Contains("CI unrelated change"),
 				Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ add second line"),
 				Contains("CI ○ add first line"),
 				Contains("CI ○ unrelated change"),

pkg/integration/tests/commit/revert_with_conflict_single_commit.go

@@ -39,9 +39,9 @@ var RevertWithConflictSingleCommit = NewIntegrationTest(NewIntegrationTestArgs{
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending reverts ---"),
+				Contains("─── Pending reverts"),
 				Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ add second line"),
 				Contains("CI ○ add first line"),
 				Contains("CI ○ add empty file"),

pkg/integration/tests/commit/shared.go

@@ -43,10 +43,10 @@ func doTheRebaseForAmendTests(t *TestDriver, keys config.KeybindingConfig) {
 
 	t.Views().Commits().
 		Lines(
-			Contains("--- Pending rebase todos ---"),
+			Contains("─── Pending rebase todos"),
 			Contains("pick").Contains("commit three"),
 			Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
-			Contains("--- Commits ---"),
+			Contains("─── Commits"),
 			Contains("commit two"),
 			Contains("file1 changed in master"),
 			Contains("base commit"),

pkg/integration/tests/filter_and_search/filter_menu.go

@@ -26,7 +26,7 @@ var FilterMenu = NewIntegrationTest(NewIntegrationTestArgs{
 					Filter("Ignore").
 					Lines(
 						// menu has filtered down to the one item that matches the filter
-						Contains(`--- Local ---`),
+						Contains(`─── Local`),
 						Contains(`Ignore`).IsSelected(),
 					).
 					Confirm()

pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go

@@ -21,7 +21,7 @@ var FilterMenuByKeybinding = NewIntegrationTest(NewIntegrationTestArgs{
 					Filter("@_").
 					Lines(
 						// menu has filtered down to the one item that matches the filter
-						Contains("--- Global ---"),
+						Contains("─── Global"),
 						Contains("_ Prev screen mode").IsSelected(),
 					).
 					Confirm()

pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go

@@ -20,7 +20,7 @@ var FilterMenuCancelFilterWithEscape = NewIntegrationTest(NewIntegrationTestArgs
 			Filter("Ignore").
 			Lines(
 				// menu has filtered down to the one item that matches the filter
-				Contains(`--- Local ---`),
+				Contains(`─── Local`),
 				Contains(`Ignore`).IsSelected(),
 			)
 

pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go

@@ -25,7 +25,7 @@ var FilterMenuWithNoKeybindings = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				// menu has filtered down to the one item that matches the
 				// filter, and it doesn't have a keybinding
-				Equals("--- Global ---"),
+				Equals("─── Global"),
 				Equals("Toggle whitespace").IsSelected(),
 			)
 	},

pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go

@@ -45,25 +45,25 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Commits().
 			IsFocused().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains(TOP_COMMIT),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains(BASE_COMMIT),
 			).
 			NavigateToLine(Contains(TOP_COMMIT)).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains(TOP_COMMIT).Contains("edit"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains(BASE_COMMIT),
 			).
 			Tap(func() {
 				t.Common().ContinueRebase()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
-				Contains("--- Commits ---"),
+				Contains("─── Pending rebase todos"),
+				Contains("─── Commits"),
 				Contains(TOP_COMMIT),
 				Contains(BASE_COMMIT),
 			)

pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go

@@ -34,10 +34,10 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 				t.Common().AcknowledgeConflicts()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("three"),
 				Contains("fixup").Contains("<-- CONFLICT --- fixup! two"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("two"),
 				Contains("one"),
 			)
@@ -68,9 +68,9 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Commits().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("<-- CONFLICT --- three"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("two"),
 				Contains("one"),
 			)

pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go

@@ -24,9 +24,9 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-02")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-01"),
 			)
@@ -50,9 +50,9 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-01"),
 			)

pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go

@@ -24,9 +24,9 @@ var AmendNonHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-02")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-02"),
 				Contains("commit-01"),
 			)

pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go

@@ -26,14 +26,14 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-01")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-06"),
 				Contains("pick").Contains("CI commit-05"),
 				Contains("pick").Contains("CI commit-04"),
 				Contains("update-ref").Contains("branch1"),
 				Contains("pick").Contains("CI commit-03"),
 				Contains("pick").Contains("CI commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ commit-01"),
 			).
 			NavigateToLine(Contains("update-ref")).
@@ -45,13 +45,13 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-06"),
 				Contains("pick").Contains("CI commit-05"),
 				Contains("pick").Contains("CI commit-04"),
 				Contains("pick").Contains("CI commit-03").IsSelected(),
 				Contains("pick").Contains("CI commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ commit-01"),
 			).
 			NavigateToLine(Contains("commit-02")).

pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go

@@ -41,14 +41,14 @@ var DontShowBranchHeadsForTodoItems = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-04")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-09"),
 				Contains("pick").Contains("CI commit-08"),
 				Contains("pick").Contains("CI commit-07"),
 				Contains("update-ref").Contains("branch2"),
 				Contains("pick").Contains("CI commit-06"), // no star on this entry, even though branch2 points to it
 				Contains("pick").Contains("CI commit-05"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI commit-04"),
 				Contains("CI commit-03"),
 				Contains("CI * commit-02"), // this star is fine though

pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go

@@ -39,14 +39,14 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-02")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-07"),
 				Contains("pick").Contains("CI commit-06"),
 				Contains("pick").Contains("CI commit-05"),
 				Contains("update-ref").Contains("branch1").DoesNotContain("*"),
 				Contains("pick").Contains("CI commit-04"),
 				Contains("pick").Contains("CI commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI commit-02").IsSelected(),
 				Contains("CI commit-01"),
 			).

pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go

@@ -25,9 +25,9 @@ var EditAndAutoAmend = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-02")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-01"),
 			)

pkg/integration/tests/interactive_rebase/edit_first_commit.go

@@ -24,9 +24,9 @@ var EditFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-01")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01").IsSelected(),
 			).
 			Tap(func() {

pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go

@@ -37,11 +37,11 @@ var EditLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-03")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-05"),
 				Contains("pick").Contains("CI commit-04"),
 				Contains("update-ref").Contains("branch1"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI * commit-03").IsSelected(),
 				Contains("CI commit-02"),
 				Contains("CI commit-01"),

pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go

@@ -23,8 +23,8 @@ var EditNonTodoCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
 			).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
-				Contains("--- Commits ---"),
+				Contains("─── Pending rebase todos"),
+				Contains("─── Commits"),
 				Contains("commit-02"),
 				Contains("commit-01"),
 			).

pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go

@@ -27,10 +27,10 @@ var EditRangeSelectDownToMergeOutsideRebase = NewIntegrationTest(NewIntegrationT
 			Press(keys.Universal.RangeSelectDown).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("edit CI commit-02").IsSelected(),
 				Contains("edit CI commit-01").IsSelected(),
-				Contains("--- Commits ---").IsSelected(),
+				Contains("─── Commits").IsSelected(),
 				Contains("     CI ◎─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(),
 				Contains("     CI │ ○ * second-change-branch unrelated change"),
 				Contains("     CI │ ○ second change"),

pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go

@@ -37,13 +37,13 @@ var EditRangeSelectOutsideRebase = NewIntegrationTest(NewIntegrationTestArgs{
 			).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("merge CI Merge branch 'second-change-branch' into first-change-branch").IsSelected(),
 				Contains("edit  CI first change").IsSelected(),
 				Contains("edit  CI * second-change-branch unrelated change").IsSelected(),
 				Contains("edit  CI second change").IsSelected(),
 				Contains("edit  CI * original").IsSelected(),
-				Contains("--- Commits ---").IsSelected(),
+				Contains("─── Commits").IsSelected(),
 				Contains("      CI ○ three").IsSelected(),
 				Contains("      CI ○ two"),
 				Contains("      CI ○ one"),

pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go

@@ -32,10 +32,10 @@ var EditTheConflCommit = NewIntegrationTest(NewIntegrationTestArgs{
 			}).
 			Focus().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit two"),
 				Contains("pick").Contains("<-- CONFLICT --- commit three"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit one"),
 			).
 			NavigateToLine(Contains("<-- CONFLICT --- commit three")).

pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go

@@ -28,20 +28,20 @@ var FixupKeepMessageRebase = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("First Commit")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick CI Third Commit"),
 				Contains("pick CI Second Commit"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("First Commit").IsSelected(),
 			).
 			// Mark second commit as fixup
 			NavigateToLine(Contains("Second Commit")).
 			Press(keys.Commits.MarkCommitAsFixup).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick  CI Third Commit"),
 				Contains("fixup CI Second Commit").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("First Commit"),
 			).
 			// Now set the -C flag using the SetFixupMessage keybinding
@@ -53,10 +53,10 @@ var FixupKeepMessageRebase = NewIntegrationTest(NewIntegrationTestArgs{
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick     CI Third Commit"),
 				Contains("fixup -C CI Second Commit").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("First Commit"),
 			).
 			// Continue the rebase

pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go

@@ -32,11 +32,11 @@ var InteractiveRebaseOfCopiedBranch = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-01")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				// No update-ref todo for branch1 here, even though command-line git would have added it
 				Contains("pick").Contains("CI commit-03"),
 				Contains("pick").Contains("CI commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI commit-01"),
 			)
 	},

pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go

@@ -52,9 +52,9 @@ var InteractiveRebaseWithConflictForEditCommand = NewIntegrationTest(NewIntegrat
 
 		t.Views().Commits().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("edit").Contains("<-- CONFLICT --- this will conflict").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-03"),
 				Contains("commit-02"),
 				Contains("commit-01"),

pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go

@@ -24,13 +24,13 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
 			// Start a rebase
 			Press(keys.Universal.Edit).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
 				Contains("pick").Contains("commit-07"),
 				Contains("pick").Contains("commit-06"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05").IsSelected(),
 				Contains("commit-04"),
 			).
@@ -38,73 +38,73 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
 			// perform various actions on a range of commits
 			Press(keys.Universal.RangeSelectUp).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
 				Contains("pick").Contains("commit-07").IsSelected(),
 				Contains("pick").Contains("commit-06").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
 			Press(keys.Commits.MarkCommitAsFixup).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
 				Contains("fixup").Contains("commit-07").IsSelected(),
 				Contains("fixup").Contains("commit-06").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
 			Press(keys.Commits.PickCommit).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
 				Contains("pick").Contains("commit-07").IsSelected(),
 				Contains("pick").Contains("commit-06").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
 			Press(keys.Universal.Edit).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
 				Contains("edit").Contains("commit-07").IsSelected(),
 				Contains("edit").Contains("commit-06").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
 			Press(keys.Commits.SquashDown).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
 				Contains("squash").Contains("commit-07").IsSelected(),
 				Contains("squash").Contains("commit-06").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
 			Press(keys.Commits.MoveDownCommit).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
 				Contains("squash").Contains("commit-07").IsSelected(),
 				Contains("squash").Contains("commit-06").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
@@ -113,37 +113,37 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
 			}).
 			Press(keys.Commits.MoveUpCommit).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("squash").Contains("commit-07").IsSelected(),
 				Contains("squash").Contains("commit-06").IsSelected(),
 				Contains("pick").Contains("commit-08"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
 			Press(keys.Commits.MoveUpCommit).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-10"),
 				Contains("squash").Contains("commit-07").IsSelected(),
 				Contains("squash").Contains("commit-06").IsSelected(),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
 			Press(keys.Commits.MoveUpCommit).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("squash").Contains("commit-07").IsSelected(),
 				Contains("squash").Contains("commit-06").IsSelected(),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
@@ -152,13 +152,13 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
 				t.ExpectToast(Contains("Disabled: Cannot move any further"))
 			}).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("squash").Contains("commit-07").IsSelected(),
 				Contains("squash").Contains("commit-06").IsSelected(),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-05"),
 				Contains("commit-04"),
 			).
@@ -167,13 +167,13 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-08")).
 			Press(keys.Universal.RangeSelectDown).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("squash").Contains("commit-07"),
 				Contains("squash").Contains("commit-06"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08").IsSelected(),
-				Contains("--- Commits ---").IsSelected(),
+				Contains("─── Commits").IsSelected(),
 				Contains("commit-05").IsSelected(),
 				Contains("commit-04"),
 			).
@@ -182,13 +182,13 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
 				t.ExpectToast(Contains("Disabled: When rebasing, this action only works on a selection of TODO commits."))
 			}).
 			TopLines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("squash").Contains("commit-07"),
 				Contains("squash").Contains("commit-06"),
 				Contains("pick").Contains("commit-10"),
 				Contains("pick").Contains("commit-09"),
 				Contains("pick").Contains("commit-08").IsSelected(),
-				Contains("--- Commits ---").IsSelected(),
+				Contains("─── Commits").IsSelected(),
 				Contains("commit-05").IsSelected(),
 				Contains("commit-04"),
 			).

pkg/integration/tests/interactive_rebase/move_in_rebase.go

@@ -25,30 +25,30 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-01")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-04"),
 				Contains("commit-03"),
 				Contains("commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01").IsSelected(),
 			).
 			SelectPreviousItem().
 			Press(keys.Commits.MoveUpCommit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-04"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01"),
 			).
 			Press(keys.Commits.MoveUpCommit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-04"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01"),
 			).
 			// assert we can't move past the top
@@ -57,29 +57,29 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
 				t.ExpectToast(Contains("Disabled: Cannot move any further"))
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-04"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01"),
 			).
 			Press(keys.Commits.MoveDownCommit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-04"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01"),
 			).
 			Press(keys.Commits.MoveDownCommit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-04"),
 				Contains("commit-03"),
 				Contains("commit-02").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01"),
 			).
 			// assert we can't move past the bottom
@@ -88,21 +88,21 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
 				t.ExpectToast(Contains("Disabled: Cannot move any further"))
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-04"),
 				Contains("commit-03"),
 				Contains("commit-02").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01"),
 			).
 			// move it back up one so that we land in a different order than we started with
 			Press(keys.Commits.MoveUpCommit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-04"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01"),
 			).
 			Tap(func() {

pkg/integration/tests/interactive_rebase/move_todo_down_with_rapid_keypresses.go

@@ -38,11 +38,11 @@ var MoveTodoDownWithRapidKeypresses = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-01")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-04"),
 				Contains("commit-03"),
 				Contains("commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-01").IsSelected(),
 			).
 			NavigateToLine(Contains("commit-04")).

pkg/integration/tests/interactive_rebase/move_update_ref_todo.go

@@ -26,28 +26,28 @@ var MoveUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-01")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-06"),
 				Contains("pick").Contains("CI commit-05"),
 				Contains("pick").Contains("CI commit-04"),
 				Contains("update-ref").Contains("branch1"),
 				Contains("pick").Contains("CI commit-03"),
 				Contains("pick").Contains("CI commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ commit-01"),
 			).
 			NavigateToLine(Contains("update-ref")).
 			Press(keys.Commits.MoveUpCommit).
 			Press(keys.Commits.MoveUpCommit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-06"),
 				Contains("update-ref").Contains("branch1"),
 				Contains("pick").Contains("CI commit-05"),
 				Contains("pick").Contains("CI commit-04"),
 				Contains("pick").Contains("CI commit-03"),
 				Contains("pick").Contains("CI commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ commit-01"),
 			).
 			Tap(func() {

pkg/integration/tests/interactive_rebase/pick_rescheduled.go

@@ -26,10 +26,10 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("one")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("three"),
 				Contains("pick").Contains("two"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("one").IsSelected(),
 			).
 			Tap(func() {
@@ -41,9 +41,9 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("three"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("two"),
 				Contains("one"),
 			)

pkg/integration/tests/interactive_rebase/quick_start.go

@@ -73,10 +73,10 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{
 			// Verify quick start picks the last commit on the main branch
 			Press(keys.Commits.StartInteractiveRebase).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("feature-branch two").IsSelected(),
 				Contains("feature-branch one"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("last main commit"),
 				Contains("initial commit"),
 			).
@@ -106,9 +106,9 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{
 			).
 			Press(keys.Commits.StartInteractiveRebase).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("branch-with-merge three").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("Merge branch 'branch-to-merge'"),
 				Contains("branch-to-merge two"),
 				Contains("branch-to-merge one"),

pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go

@@ -39,7 +39,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-02")).
 			Press(keys.Commits.StartInteractiveRebase).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-07"),
 				Contains("pick").Contains("CI commit-06"),
 				Contains("pick").Contains("CI commit-05"),
@@ -47,7 +47,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("pick").Contains("CI commit-04"),
 				Contains("pick").Contains("CI commit-03"),
 				Contains("CI commit-02").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI commit-01"),
 			)
 	},

pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go

@@ -43,7 +43,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{
 			).
 			Press(keys.Commits.StartInteractiveRebase).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("CI commit-07"),
 				Contains("CI commit-06"),
 				Contains("update-ref").Contains("branch2"),
@@ -52,7 +52,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("update-ref").Contains("branch1").IsSelected(),
 				Contains("CI commit-03").IsSelected(),
 				Contains("CI commit-02").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI commit-01"),
 			)
 	},

pkg/integration/tests/interactive_rebase/rebase.go

@@ -34,60 +34,60 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("first commit to edit")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				MatchesRegexp("pick.*commit to fixup"),
 				MatchesRegexp("pick.*commit to drop"),
 				MatchesRegexp("pick.*second commit to edit"),
 				MatchesRegexp("pick.*commit to squash"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("first commit to edit").IsSelected(),
 				Contains("initial commit"),
 			).
 			SelectPreviousItem().
 			Press(keys.Commits.SquashDown).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				MatchesRegexp("pick.*commit to fixup"),
 				MatchesRegexp("pick.*commit to drop"),
 				MatchesRegexp("pick.*second commit to edit"),
 				MatchesRegexp("squash.*commit to squash").IsSelected(),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("first commit to edit"),
 				Contains("initial commit"),
 			).
 			SelectPreviousItem().
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				MatchesRegexp("pick.*commit to fixup"),
 				MatchesRegexp("pick.*commit to drop"),
 				MatchesRegexp("edit.*second commit to edit").IsSelected(),
 				MatchesRegexp("squash.*commit to squash"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("first commit to edit"),
 				Contains("initial commit"),
 			).
 			SelectPreviousItem().
 			Press(keys.Universal.Remove).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				MatchesRegexp("pick.*commit to fixup"),
 				MatchesRegexp("drop.*commit to drop").IsSelected(),
 				MatchesRegexp("edit.*second commit to edit"),
 				MatchesRegexp("squash.*commit to squash"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("first commit to edit"),
 				Contains("initial commit"),
 			).
 			SelectPreviousItem().
 			Press(keys.Commits.MarkCommitAsFixup).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				MatchesRegexp("fixup.*commit to fixup").IsSelected(),
 				MatchesRegexp("drop.*commit to drop"),
 				MatchesRegexp("edit.*second commit to edit"),
 				MatchesRegexp("squash.*commit to squash"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("first commit to edit"),
 				Contains("initial commit"),
 			).
@@ -95,10 +95,10 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
 				t.Common().ContinueRebase()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				MatchesRegexp("fixup.*commit to fixup").IsSelected(),
 				MatchesRegexp("drop.*commit to drop"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("second commit to edit"),
 				MatchesRegexp("first commit to edit"),
 				Contains("initial commit"),

pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go

@@ -30,9 +30,9 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA
 			NavigateToLine(Contains("commit-03")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-04"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-03").IsSelected(),
 				Contains("commit-02"),
 				Contains("commit-01"),
@@ -49,9 +49,9 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("commit-04"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains(`Revert "commit-01"`),
 				Contains(`Revert "commit-02"`),
 				Contains("commit-03"),

pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go

@@ -50,13 +50,13 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("CI unrelated change 3"),
 				Contains("CI unrelated change 2"),
-				Contains("--- Pending reverts ---"),
+				Contains("─── Pending reverts"),
 				Contains("revert").Contains("CI unrelated change 1"),
 				Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ add second line"),
 				Contains("CI ○ add first line"),
 				Contains("CI ○ unrelated change 1"),
@@ -83,10 +83,10 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration
 
 		t.Views().Commits().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI unrelated change 3"),
 				Contains("pick").Contains("CI unrelated change 2"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains(`CI ○ Revert "unrelated change 1"`),
 				Contains(`CI ○ Revert "add first line"`),
 				Contains("CI ○ add second line"),

pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go

@@ -45,12 +45,12 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes
 					Cancel() // stay in commits panel
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("CI unrelated change 2"),
 				Contains("CI unrelated change 1"),
-				Contains("--- Pending reverts ---"),
+				Contains("─── Pending reverts"),
 				Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ add second line"),
 				Contains("CI ○ add first line").IsSelected(),
 				Contains("CI ○ add empty file"),
@@ -84,10 +84,10 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes
 
 		t.Views().Commits().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI unrelated change 2"),
 				Contains("pick").Contains("CI unrelated change 1"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains(`CI ○ Revert "add first line"`),
 				Contains("CI ○ add second line"),
 				Contains("CI ○ add first line"),

pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go

@@ -33,9 +33,9 @@ var RewordCommitWithEditorAndFail = NewIntegrationTest(NewIntegrationTestArgs{
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-01"),
 			)

pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go

@@ -25,9 +25,9 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit-02")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-01"),
 			).
@@ -41,9 +41,9 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("renamed 02").IsSelected(),
 				Contains("commit-01"),
 			)

pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go

@@ -27,9 +27,9 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs
 			NavigateToLine(Contains("commit-02")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit-02").IsSelected(),
 				Contains("commit-01"),
 			).
@@ -41,9 +41,9 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs
 					Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("renamed 02").IsSelected(),
 				Contains("commit-01"),
 			)

pkg/integration/tests/interactive_rebase/shared.go

@@ -9,10 +9,10 @@ func handleConflictsFromSwap(t *TestDriver, expectedCommand string) {
 
 	t.Views().Commits().
 		Lines(
-			Contains("--- Pending rebase todos ---"),
+			Contains("─── Pending rebase todos"),
 			Contains("pick").Contains("commit two"),
 			Contains(expectedCommand).Contains("<-- CONFLICT --- commit three"),
-			Contains("--- Commits ---"),
+			Contains("─── Commits"),
 			Contains("commit one"),
 		)
 

pkg/integration/tests/interactive_rebase/show_exec_todos.go

@@ -31,10 +31,10 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{
 				t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("Rebasing (2/4)Executing: false")).Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("exec").Contains("false"),
 				Contains("pick").Contains("CI commit-03"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI ○ commit-02"),
 				Contains("CI ○ commit-01"),
 			).
@@ -43,8 +43,8 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{
 				t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("exit status 1")).Confirm()
 			}).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
-				Contains("--- Commits ---"),
+				Contains("─── Pending rebase todos"),
+				Contains("─── Commits"),
 				Contains("CI ○ commit-03"),
 				Contains("CI ○ commit-02"),
 				Contains("CI ○ commit-01"),

pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go

@@ -29,19 +29,19 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit one")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit three"),
 				Contains("commit two"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit one").IsSelected(),
 			).
 			SelectPreviousItem().
 			Press(keys.Commits.MoveUpCommit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit two").IsSelected(),
 				Contains("commit three"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit one"),
 			).
 			Tap(func() {

pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go

@@ -29,19 +29,19 @@ var SwapInRebaseWithConflictAndEdit = NewIntegrationTest(NewIntegrationTestArgs{
 			NavigateToLine(Contains("commit one")).
 			Press(keys.Universal.Edit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit three"),
 				Contains("commit two"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit one").IsSelected(),
 			).
 			NavigateToLine(Contains("commit two")).
 			Press(keys.Commits.MoveUpCommit).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("commit two").IsSelected(),
 				Contains("commit three"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("commit one"),
 			).
 			NavigateToLine(Contains("commit three")).

pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go

@@ -28,11 +28,11 @@ var ViewFilesOfTodoEntries = NewIntegrationTest(NewIntegrationTestArgs{
 			Focus().
 			Press(keys.Commits.StartInteractiveRebase).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("CI commit-03").IsSelected(),
 				Contains("update-ref").Contains("branch1"),
 				Contains("pick").Contains("CI commit-02"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("CI commit-01"),
 			).
 			Press(keys.Universal.GoInto)

pkg/integration/tests/sync/pull_rebase_interactive_conflict.go

@@ -48,10 +48,10 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Commits().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("five"),
 				Contains("pick").Contains("CONFLICT").Contains("four"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("three"),
 				Contains("two"),
 				Contains("one"),

pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go

@@ -49,20 +49,20 @@ var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArg
 		t.Views().Commits().
 			Focus().
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("pick").Contains("five").IsSelected(),
 				Contains("pick").Contains("CONFLICT").Contains("four"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("three"),
 				Contains("two"),
 				Contains("one"),
 			).
 			Press(keys.Universal.Remove).
 			Lines(
-				Contains("--- Pending rebase todos ---"),
+				Contains("─── Pending rebase todos"),
 				Contains("drop").Contains("five").IsSelected(),
 				Contains("pick").Contains("CONFLICT").Contains("four"),
-				Contains("--- Commits ---"),
+				Contains("─── Commits"),
 				Contains("three"),
 				Contains("two"),
 				Contains("one"),