mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-06 11:02:41 +03:00
Show original todo action instead of "conflict", and show <-- CONFLICT
instead
It is useful to see if the conflicted commit was a "pick" or an "edit". What's more, we're about to add support for showing cherry-picks and reverts, and seeing that a conflicted commit was a revert is important because its diff is backwards compared to the diff of the conflicting files in the Files panel.
This commit is contained in:
@@ -4,13 +4,13 @@ import (
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
func handleConflictsFromSwap(t *TestDriver) {
|
||||
func handleConflictsFromSwap(t *TestDriver, expectedCommand string) {
|
||||
t.Common().AcknowledgeConflicts()
|
||||
|
||||
t.Views().Commits().
|
||||
Lines(
|
||||
Contains("pick").Contains("commit two"),
|
||||
Contains("conflict").Contains("<-- YOU ARE HERE --- commit three"),
|
||||
Contains(expectedCommand).Contains("<-- CONFLICT --- commit three"),
|
||||
Contains("commit one"),
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user