git: aed45a13aea9 - stable/11 - pwrite(2): remove git message that committed by accident
Guangyuan Yang
ygy at FreeBSD.org
Sun Feb 28 05:06:31 UTC 2021
The branch stable/11 has been updated by ygy (doc committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=aed45a13aea9db0b24299a10f0eac8192776b141
commit aed45a13aea9db0b24299a10f0eac8192776b141
Author: Guangyuan Yang <ygy at FreeBSD.org>
AuthorDate: 2021-02-28 04:48:04 +0000
Commit: Guangyuan Yang <ygy at FreeBSD.org>
CommitDate: 2021-02-28 05:06:07 +0000
pwrite(2): remove git message that committed by accident
Fix the manpage after accidentally committed 3-way merge info in 1350f1ccc156299c4de2772afa8784283c8f6ab4.
---
lib/libc/sys/write.2 | 8 --------
1 file changed, 8 deletions(-)
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index 75574adb0996..95f0ca9c0532 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -28,11 +28,7 @@
.\" @(#)write.2 8.5 (Berkeley) 4/2/94
.\" $FreeBSD$
.\"
-<<<<<<< HEAD
-.Dd October 23, 2017
-=======
.Dd February 11, 2021
->>>>>>> 504e64af32ba (pwrite(2): add a BUGS section)
.Dt WRITE 2
.Os
.Sh NAME
@@ -291,9 +287,6 @@ system call appeared in
The
.Fn write
function appeared in
-<<<<<<< HEAD
-.At v6 .
-=======
.At v1 .
.Sh BUGS
The
@@ -309,4 +302,3 @@ writes into
regardless of whether
.Dv O_APPEND
is set.
->>>>>>> 504e64af32ba (pwrite(2): add a BUGS section)
More information about the dev-commits-src-all
mailing list