diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-21 14:12:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-21 14:18:52 (GMT) |
| commit | 932848f420a738ee07997198fead5b2c2fbf4787 (patch) | |
| tree | 40404c3244ba87c5e71e8dd076f4dbcde6d8cfeb /Utilities/cmlibarchive/libarchive/mtree.5 | |
| parent | e4b7d5afde91efafb59749a0a513732a089a6f0a (diff) | |
| parent | 1a8c7bc2c649781d1163c1966245a45e0fb829ba (diff) | |
| download | CMake-932848f420a738ee07997198fead5b2c2fbf4787.zip CMake-932848f420a738ee07997198fead5b2c2fbf4787.tar.gz CMake-932848f420a738ee07997198fead5b2c2fbf4787.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts by integrating changes from both sides.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/mtree.5')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/mtree.5 | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/Utilities/cmlibarchive/libarchive/mtree.5 b/Utilities/cmlibarchive/libarchive/mtree.5 index 8c45a7d..16c8abe 100644 --- a/Utilities/cmlibarchive/libarchive/mtree.5 +++ b/Utilities/cmlibarchive/libarchive/mtree.5 @@ -56,14 +56,6 @@ corresponding character. .Pp Each line is interpreted independently as one of the following types: .Bl -tag -width Cm -.It Signature -The first line of any mtree file must begin with -.Dq #mtree . -If a file contains any full path entries, the first line should -begin with -.Dq #mtree v2.0 , -otherwise, the first line should begin with -.Dq #mtree v1.0 . .It Blank Blank lines are ignored. .It Comment @@ -302,16 +294,6 @@ The file owner as a symbolic name. .Xr find 1 , .Xr mtree 8 .Sh BUGS -The -.Fx -implementation of mtree does not currently support -the -.Nm -2.0 -format. -The requirement for a -.Dq #mtree -signature line is new and not yet widely implemented. .Sh HISTORY The .Nm |