summaryrefslogtreecommitdiffstats
path: root/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
AgeCommit message (Expand)Author
2024-01-25Support range select for staging/discarding filesJesse Duffield
2023-07-10Fix conflict testRyooooooga
2023-05-25Use sentence case everywhereJesse Duffield
2023-05-23Construct arg vector manually rather than parse stringJesse Duffield
2023-04-14fix flaky testsJesse Duffield
2023-03-07Concatenate patches to apply them all at onceStefan Haller
2023-03-07Add test for reverse-applying a patch that conflictsStefan Haller