1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-04 03:48:07 +02:00
lazygit/pkg
Ryooooooga 85f7aa9d7b Fix conflict test
The test apply_in_reverse_with_conflict.go fails in git versions 2.30.8 and
earlier. Apparently the output "Applied patch to 'file2' cleanly" was only added
more recently. It's not essential that we check this output.
2023-07-10 15:09:17 +02:00
..
app Use comment char config on interactive rebase 2023-07-02 02:07:32 -03:00
cheatsheet Use sentence case everywhere 2023-05-25 23:52:19 +10:00
commands Replace uses of "git stash save" with "git stash push" 2023-07-10 15:09:17 +02:00
common
config Color view frame differently when searching/filtering 2023-07-03 12:54:14 +10:00
constants
env
fakes cleanup integration test code 2023-02-26 12:54:13 +11:00
gui Replace uses of "git stash save" with "git stash push" 2023-07-10 15:09:17 +02:00
i18n Differentiate between different filter modes 2023-07-03 12:54:14 +10:00
integration Fix conflict test 2023-07-10 15:09:17 +02:00
logs Allow global logging when developing 2023-05-25 18:31:32 +10:00
secureexec Cache binary paths 2023-05-23 19:15:33 +10:00
snake
tasks Refactor 2023-07-10 17:12:21 +10:00
theme Color view frame differently when searching/filtering 2023-07-03 12:54:14 +10:00
updates Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
utils View filtering (#2680) 2023-07-03 12:57:11 +10:00