]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
projects / thirdparty / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72a68f9 38c432b)
Merge pull request #13962 from keszybz/man-ordering
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 8 Nov 2019 09:18:46 +0000 (10:18 +0100)
committerGitHub <noreply@github.com>
Fri, 8 Nov 2019 09:18:46 +0000 (10:18 +0100)
Describe ordering in case of Conflicts=

1  2 
man/systemd.unit.xml patch | diff1 | diff2 | blob | history

diff --cc man/systemd.unit.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.