1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-27 23:08:02 +02:00
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
..
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-07-08 22:54:52 +10:00
2023-07-10 19:13:18 +10:00
2023-07-10 15:09:17 +02:00
2023-06-03 15:54:03 +10:00
2023-07-10 15:09:17 +02:00
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-07-03 12:57:11 +10:00
2023-02-26 12:54:13 +11:00