use w3c definition of \w (see #73) #81

Open

benibela wants to merge 1 commit from benibela/w3cword into master

benibela commented

2021-09-12 13:07:54 +00:00

(Migrated from github.com)

No description provided.

This pull request has changes conflicting with the target branch.

src/PUCU.pas

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'use w3c definition of \w (see #73)' (#81) from benibela/w3cword into master

Merge commit body

Reviewed-on: https://git.rosseaux.net/BeRo1985/flre/pulls/81

Merge pull request 'use w3c definition of \w (see #73)' (#81) from benibela/w3cword into master

Reviewed-on: https://git.rosseaux.net/BeRo1985/flre/pulls/81

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin benibela/w3cword:benibela/w3cword

git switch benibela/w3cword

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff benibela/w3cword

git switch benibela/w3cword

git rebase master

git switch master

git merge --ff-only benibela/w3cword

git switch benibela/w3cword

git rebase master

git switch master

git merge --no-ff benibela/w3cword

git switch master

git merge --squash benibela/w3cword