sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Show original todo action instead of "conflict", and show <-- CONFLICT instead

Browse Source 
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:
Stefan Haller
2024-06-13 16:55:20 +02:00
parent 9c8f987934
commit ff465e2581
19 changed files with 81 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go
View File

@ -35,7 +35,7 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
}).
Lines(
Contains("pick").Contains("three"),
Contains("conflict").Contains("<-- YOU ARE HERE --- fixup! two"),
Contains("fixup").Contains("<-- CONFLICT --- fixup! two"),
Contains("two"),
Contains("one"),
)
@ -66,7 +66,7 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Commits().
Lines(
Contains("<-- YOU ARE HERE --- three"),
Contains("<-- CONFLICT --- three"),
Contains("two"),
Contains("one"),
)