1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-10 11:10:18 +02:00
lazygit/pkg/integration/tests
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
..
bisect Use sentence case everywhere 2023-05-25 23:52:19 +10:00
branch Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
cherry_pick Use sentence case everywhere 2023-05-25 23:52:19 +10:00
commit Add busy count for integration tests 2023-07-08 22:54:52 +10:00
config Support matchers on integers in integration tests 2023-06-03 15:32:23 +10:00
conflicts Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
custom_commands Support suggestions generated from command in custom commands 2023-05-29 22:47:35 +10:00
diff Add busy count for integration tests 2023-07-08 22:54:52 +10:00
file Retry on index.lock error 2023-07-10 19:13:18 +10:00
filter_and_search Use searching, not filtering, in file tree views 2023-07-03 12:54:14 +10:00
filter_by_path Use sentence case everywhere 2023-05-25 23:52:19 +10:00
interactive_rebase Add busy count for integration tests 2023-07-08 22:54:52 +10:00
misc Fix focus issue when opening recent-repos menu at launch 2023-06-07 18:27:18 +10:00
patch_building Fix conflict test 2023-07-10 15:09:17 +02:00
reflog Fix flakey test 2023-06-03 15:54:03 +10:00
shared Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
staging Fix the title and text (and variable names) of the Discard Changes prompt 2023-06-26 08:15:35 +02:00
stash Remove StashWithMessage function 2023-07-10 15:09:17 +02:00
submodule Use sentence case everywhere 2023-05-25 23:52:19 +10:00
sync Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
tag Use sentence case everywhere 2023-05-25 23:52:19 +10:00
ui Use sentence case everywhere 2023-05-25 23:52:19 +10:00
undo Use sentence case everywhere 2023-05-25 23:52:19 +10:00
test_list_generator.go cleanup integration test code 2023-02-26 12:54:13 +11:00
test_list.go View filtering (#2680) 2023-07-03 12:57:11 +10:00
tests.go cleanup integration test code 2023-02-26 12:54:13 +11:00