summaryrefslogtreecommitdiffstats
path: root/doc/src/sgml/man7/MERGE.7 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merging upstream version 15.7.Daniel Baumann2024-05-211-64/+58
| | | | Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
* Merging upstream version 15.6.Daniel Baumann2024-05-041-10/+14
| | | | Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
* Adding upstream version 15.5.upstream/15.5Daniel Baumann2024-05-041-0/+674
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>