print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

apply_patch creates conflicts instead of rejects

Browse Source
This commit is contained in:
Reonu
2021-07-15 01:10:17 +01:00
parent ba670dcdd1
commit 793c9aacb2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/apply_patch.sh
View File

@@ -13,7 +13,7 @@ fi
read -p "Do you wish to apply the patch '$1'? [Y/N] " response
case "$response" in
Y|y)
patch -p1 < "$1"
patch -p1 --merge < "$1"
;;
N|n)
echo 'Quit'