public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/python-merge3] epel10: Add a man page
Date: Thu, 03 Sep 2026 18:48:54 GMT [thread overview]
Message-ID: <178846133406.1.10574784421144900035.rpms-python-merge3-fdddf8ead29f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/python-merge3
Branch : epel10
Commit : fdddf8ead29f974fd3dbeaeb08cfb9b9d86c0dba
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-09-03T18:32:25+01:00
Stats : +47/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/python-merge3/c/fdddf8ead29f974fd3dbeaeb08cfb9b9d86c0dba?branch=epel10
Log:
Add a man page
---
diff --git a/merge3.1 b/merge3.1
new file mode 100644
index 0000000..1486ccf
--- /dev/null
+++ b/merge3.1
@@ -0,0 +1,39 @@
+.TH MERGE3 "1" "September 2026" "" "User Commands"
+.SH NAME
+.B merge3
+\(en 3-way merge of texts
+.SH SYNOPSIS
+.B merge3
+.RB [ \-h ]
+.RB [ \-\-annotated ]
+.I mine
+.I base
+.I other
+.SH DESCRIPTION
+Given
+.IR base ,
+.IR other ,
+.IR this ,
+tries to produce a combined text
+incorporating the changes from both
+.IR base \[->] other
+and
+.IR base \[->] this .
+.SH OPTIONS
+.SS "POSITIONAL ARGUMENTS"
+.TP
+.I mine
+My text
+.TP
+.I base
+Base text
+.TP
+.I other
+Other text
+.SS "OPTIONAL ARGUMENTS"
+.TP
+.B \-h\fR, \-\-help
+Show a help message and exit.
+.TP
+.B \-\-annotated
+Show annotated view.
diff --git a/python-merge3.spec b/python-merge3.spec
index d296ba8..50e93a5 100644
--- a/python-merge3.spec
+++ b/python-merge3.spec
@@ -10,7 +10,10 @@ Summary: Python implementation of 3-way merge
License: GPL-2.0-or-later
URL: https://www.breezy-vcs.org
%global forgeurl https://github.com/breezy-team/merge3
-Source: %{forgeurl}/archive/v%{version}/merge3-%{version}.tar.gz
+Source0: %{forgeurl}/archive/v%{version}/merge3-%{version}.tar.gz
+# Man page hand-written for Fedora in groff_man(7) format based on --help text
+# and on README.rst.
+Source1: merge3.1
# pass -v in tox.ini to unittest invocation
Patch: merge3-verbose-testlog.diff
@@ -55,6 +58,9 @@ Summary: %{summary}
%pyproject_install
%pyproject_save_files -l merge3
+install -D --target='%{buildroot}%{_mandir}/man1' \
+ --preserve-timestamps --mode=0644 '%{SOURCE1}'
+
%check
%tox
@@ -64,6 +70,7 @@ Summary: %{summary}
%doc README.rst
%{_bindir}/merge3
+%{_mandir}/man1/merge3.1*
%changelog
reply other threads:[~2026-09-03 18:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178846133406.1.10574784421144900035.rpms-python-merge3-fdddf8ead29f@fedoraproject.org \
--to=code@musicinmybrain.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox