sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-07 22:02:56 +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/sync/pull_rebase_interactive_conflict_drop.go
View File

@@ -50,7 +50,7 @@ var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArg
Focus().
Lines(
Contains("pick").Contains("five").IsSelected(),
Contains("conflict").Contains("YOU ARE HERE").Contains("four"),
Contains("pick").Contains("CONFLICT").Contains("four"),
Contains("three"),
Contains("two"),
Contains("one"),
@@ -58,7 +58,7 @@ var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArg
Press(keys.Universal.Remove).
Lines(
Contains("drop").Contains("five").IsSelected(),
Contains("conflict").Contains("YOU ARE HERE").Contains("four"),
Contains("pick").Contains("CONFLICT").Contains("four"),
Contains("three"),
Contains("two"),
Contains("one"),