Stefan Haller ff465e2581 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.

2025-04-20 15:55:44 +02:00

..

fetch_prune.go

Fix typos

2025-01-03 10:50:36 +11:00

fetch_when_sorted_by_date.go

Keep same branch selected when refreshing branches

2024-01-19 09:25:07 +01:00

force_push_multiple_matching.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

force_push_multiple_upstream.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

force_push_remote_branch_not_stored_locally.go

Add integration test for pushing when the remote is not stored locally

2024-06-01 08:12:45 +02:00

force_push_triangular.go

Correctly request force-pushing in triangular workflows

2024-05-19 09:44:38 +02:00

force_push.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

pull_and_set_upstream.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

pull_merge_conflict.go

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

pull_merge.go

Remove ColoredBranchStatus and branchStatusColor

2024-06-03 13:02:46 +02:00

pull_rebase_conflict.go

Mention which command is continued in PromptToContinueRebase

2025-04-20 15:53:17 +02:00

pull_rebase_interactive_conflict_drop.go

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

2025-04-20 15:55:44 +02:00

pull_rebase_interactive_conflict.go

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

2025-04-20 15:55:44 +02:00

pull_rebase.go

Remove ColoredBranchStatus and branchStatusColor

2024-06-03 13:02:46 +02:00

pull.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

push_and_auto_set_upstream.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

push_and_set_upstream.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

push_follow_tags.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

push_no_follow_tags.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

push_tag.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

push_with_credential_prompt.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

push.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00

rename_branch_and_pull.go

Use sentence case everywhere

2023-05-25 23:52:19 +10:00

shared.go

More explicit test of status panel content

2024-06-03 13:02:46 +02:00