| .. |
|
conflict_marker_size_not_auto_staged.go
|
Honor the conflict-marker-size gitattribute
|
2026-08-08 12:43:42 +02:00 |
|
conflict_marker_size_resolve.go
|
Honor the conflict-marker-size gitattribute
|
2026-08-08 12:43:42 +02:00 |
|
continue_prompt_dismissed_when_resolved_externally.go
|
Auto-dismiss the continue-rebase prompt when it becomes stale
|
2026-07-03 18:30:02 +02:00 |
|
filter.go
|
Add a root item ("/") if files at top level have changed
|
2025-03-21 08:04:58 +01:00 |
|
merge_file_both.go
|
Only prompt to continue a rebase/merge if we started it
|
2026-07-03 18:28:07 +02:00 |
|
merge_file_current.go
|
Only prompt to continue a rebase/merge if we started it
|
2026-07-03 18:28:07 +02:00 |
|
merge_file_incoming.go
|
Only prompt to continue a rebase/merge if we started it
|
2026-07-03 18:28:07 +02:00 |
|
pick_both_hunks_diff3.go
|
Only prompt to continue a rebase/merge if we started it
|
2026-07-03 18:28:07 +02:00 |
|
resolve_externally.go
|
Only prompt to continue a rebase/merge if we started it
|
2026-07-03 18:28:07 +02:00 |
|
resolve_externally_started_merge_no_prompt.go
|
Only prompt to continue a rebase/merge if we started it
|
2026-07-03 18:28:07 +02:00 |
|
resolve_multiple_files.go
|
Keep showing files whose conflicts have been resolved
|
2026-08-16 16:45:50 +02:00 |
|
resolve_no_auto_stage.go
|
Add a root item ("/") if files at top level have changed
|
2025-03-21 08:04:58 +01:00 |
|
resolve_non_textual_conflicts.go
|
Provide conflict resolution dialogs for non-textual conflicts
|
2025-04-09 10:27:57 +02:00 |
|
resolve_without_trailing_lf.go
|
[SQUASHED] edit-diff-line-with-modified-click
|
2026-09-06 17:32:48 +02:00 |
|
space_on_non_textual_conflict.go
|
Route space to the conflict picker for non-textual conflicts
|
2026-06-28 16:12:36 +02:00 |
|
undo_choose_hunk.go
|
Construct arg vector manually rather than parse string
|
2023-05-23 19:49:19 +10:00 |
