Fluff

man8/thin_dump.8

@@ -9,12 +9,8 @@ thin_dump \- dump thin provisioning metadata from device or file to standard out
 
 .SH DESCRIPTION
 .B thin_dump
-<<<<<<< HEAD
 dumps binary thin provisioning metadata (optionally from alternate block;
 see option \-\-metadata-snap) created by the device-mapper
-=======
-dumps binary thin provisioning metadata created by the device-mapper
->>>>>>> 9fac224f250ee2d6642d673d7d65afe346d68af5
 thin provisioning target on a device or file to standard output for
 analysis or postprocessing in either XML or human readable format.
 XML formated metadata can be fed into thin_restore (see
@@ -27,17 +23,12 @@ Print output in XML or human readable format.
 
 .IP "\fB\-r, \-\-repair\fP".
 
-<<<<<<< HEAD
 .IP "\fB\-m, \-\-metadata_snap\fP [block#]".
 Dump metadata snapshot created by device-mapper thin provisioning target.
 If block is not provided, access the default metadata snapshot created by
 the thin provisioning device-mapper target, else try the one at block#.
 See the thin provisioning target documentation on how to create or release
 a metadata snapshot.
-=======
-.IP "\fB\-m, \-\-metadata_snap\fP block#".
-Dump metadata snapshot at block#
->>>>>>> 9fac224f250ee2d6642d673d7d65afe346d68af5
 
 .IP "\fB\-h, \-\-help\fP".
 Print help and exit.

man8/thin_metadata_size.8

@@ -1,10 +1,6 @@
 .TH THIN_METADATA_SIZE 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*-
 .SH NAME
-<<<<<<< HEAD
 thin_metadata_size \- thin provisioning metadata device/file size calculator.
-=======
-thin_metadata_size \- thin provisioning metadata file/device size calculator.
->>>>>>> 9fac224f250ee2d6642d673d7d65afe346d68af5
 
 .SH SYNOPSIS
 .B thin_metadata_size
@@ -14,24 +10,15 @@ thin_metadata_size \- thin provisioning metadata file/device size calculator.
 .B thin_metadata_size
 calculates the size of the thin provisioning metadata based on the block size
 of the thin provisioned devices, the size of the thin provisioning pool and
-<<<<<<< HEAD
 the maximum number of all thin prisioned devices and snapshots.
 Because thin provisioning pools are holding widely variable contents, 
 this tool is needed to provide sensible initial default size.
-=======
-the maximum number of all thin prisioned devices and snapshots. Size/number
-option arguments can be followed by unit specifiers in short one character
-and long form (eg. -b1m or -b1megabytes).
->>>>>>> 9fac224f250ee2d6642d673d7d65afe346d68af5
 
 .IP "\fB\-b, \-\-block-size\fP \fIBLOCKSIZE[bskKmMgGtTpPeEzZyY]\fP"
 Block size of thin provisioned devices in units of bytes,sectors,kilobytes,kibibytes,... respectively.
 Default is in sectors without a block size unit specifier.
-<<<<<<< HEAD
 Size/number option arguments can be followed by unit specifiers in short one character
 and long form (eg. -b1m or -b1megabytes).
-=======
->>>>>>> 9fac224f250ee2d6642d673d7d65afe346d68af5
 
 .IP "\fB\-s, \-\-pool-size\fP \fIPOOLSIZE[bskKmMgGtTpPeEzZyY]\fP"
 Thin provisioning pool size in units of bytes,sectors,kilobytes,kibibytes,... respectively.