mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 15:46:26 -04:00
The patch contains changes to two files; the first one conflicts, the second doesn't. Note how it only applies changes to the first file at this point in the branch; we'll fix this in the next commit. This test would fail on master for multiple reasons. |
||
|---|---|---|
| .. | ||
| apply.go | ||
| apply_in_reverse.go | ||
| apply_in_reverse_with_conflict.go | ||
| copy_patch_to_clipboard.go | ||
| move_to_index.go | ||
| move_to_index_partial.go | ||
| move_to_index_with_conflict.go | ||
| move_to_new_commit.go | ||
| remove_from_commit.go | ||
| reset_with_escape.go | ||
| select_all_files.go | ||
| specific_selection.go | ||
| start_new_patch.go | ||