summaryrefslogtreecommitdiffstats
path: root/doc/src/sgml/man7/MERGE.7 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adding upstream version 16.2.upstream/16.2Daniel Baumann2024-04-131-0/+678
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>