Stefan Haller 4ca012dbfb Add test for reverse-applying a patch that conflicts ...

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.

2023-03-07 09:49:34 +01:00

..

app

Bump minimum required git version to 2.20

2023-02-19 10:20:14 +01:00

cheatsheet

…

commands

Remove parameters that are no longer needed

2023-03-07 09:49:34 +01:00

common

…

config

generated cheatsheets and ran code formatting

2023-03-05 07:06:34 +05:00

constants

…

env

…

fakes

cleanup integration test code

2023-02-26 12:54:13 +11:00

gui

Remove parameters that are no longer needed

2023-03-07 09:49:34 +01:00

i18n

mention path in tooltips

2023-02-20 19:28:45 +11:00

integration

Add test for reverse-applying a patch that conflicts

2023-03-07 09:49:34 +01:00

logs

…

secureexec

…

snake

…

tasks

…

theme

Fix setting gui.selectedRangeBgColor as a hex value

2023-03-03 08:46:43 +01:00

updates

…

utils

fix: fix ReplacePlaceholderString

2023-01-18 20:56:22 +09:00