Merge branch 'job-rsync_timeout_poll'

author Alberto Leiva Popper <ydahhrk@gmail.com>

Tue, 3 Sep 2024 21:45:50 +0000 (15:45 -0600)

committer Alberto Leiva Popper <ydahhrk@gmail.com>

Tue, 3 Sep 2024 21:45:50 +0000 (15:45 -0600)
author Alberto Leiva Popper <ydahhrk@gmail.com>
Tue, 3 Sep 2024 21:45:50 +0000 (15:45 -0600)
committer Alberto Leiva Popper <ydahhrk@gmail.com>
Tue, 3 Sep 2024 21:45:50 +0000 (15:45 -0600)
diff --cc docs/usage.md
Simple merge
diff --cc man/fort.8
Simple merge
diff --cc src/config.c
Simple merge
author	Alberto Leiva Popper <ydahhrk@gmail.com>
	Tue, 3 Sep 2024 21:45:50 +0000 (15:45 -0600)
committer	Alberto Leiva Popper <ydahhrk@gmail.com>
	Tue, 3 Sep 2024 21:45:50 +0000 (15:45 -0600)
		1	2
docs/usage.md	patch \|	diff1 \|	diff2 \|	blob \| history
man/fort.8	patch \|	diff1 \|	diff2 \|	blob \| history
src/config.c	patch \|	diff1 \|	diff2 \|	blob \| history