Searched full:ours (Results 1 – 5 of 5) sorted by relevance
| /dokuwiki/.github/workflows/ |
| H A D | release-preparation.yml | 64 git merge -s ours origin/stable
|
| /dokuwiki/vendor/geshi/geshi/src/geshi/ |
| H A D | bash.php | 197 'git merge-octopus', 'git merge-one-file', 'git merge-ours',
238 'git-merge-one-file', 'git-merge-ours', 'git-merge-recursive',
|
| /dokuwiki/inc/Parsing/ParserMode/ |
| H A D | GfmListblock.php | 20 * same exclusion key while ours is in use, the registry's pool hands them a
|
| /dokuwiki/vendor/geshi/geshi/ |
| H A D | LICENSE | 43 Also, for each author's protection and ours, we want to make certain
|
| /dokuwiki/ |
| H A D | COPYING | 43 Also, for each author's protection and ours, we want to make certain
|