1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00

Remove the "YOU ARE HERE" marker

Now that we have sections, it is no longer needed.

Keep the "<-- CONFLICTS" marker though.
This commit is contained in:
Stefan Haller
2025-04-05 13:43:50 +02:00
parent 6cbc1e0ace
commit 74054c9d70
37 changed files with 75 additions and 129 deletions

View File

@ -77,7 +77,7 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{
Contains("feature-branch two").IsSelected(),
Contains("feature-branch one"),
Contains("--- Commits ---"),
Contains("last main commit").Contains("YOU ARE HERE"),
Contains("last main commit"),
Contains("initial commit"),
).
// Try again, verify we fail because we're already rebasing
@ -109,7 +109,7 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("branch-with-merge three").IsSelected(),
Contains("--- Commits ---"),
Contains("Merge branch 'branch-to-merge'").Contains("YOU ARE HERE"),
Contains("Merge branch 'branch-to-merge'"),
Contains("branch-to-merge two"),
Contains("branch-to-merge one"),
Contains("branch-with-merge two"),