components/meld/meld.1
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 227 1e1ccdc6b1e6
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
227
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     1
'\" t
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     2
.TH meld 1 "18 Nov 2010" "SunOS 5.11" "User Commands"
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     3
.SH NAME
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     4
meld \- graphical diff and merge tool
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     5
.SH SYNOPSIS
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     6
.LP
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     7
.nf
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     8
\fBmeld\fR [\fB--version\fR] [\fB-h\fR] [\fB--help\fR]
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     9
\fBmeld\fR [\fB-aceru\fR] \fIfile\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    10
\fBmeld\fR [\fB-aceru\fR] \fIdir\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    11
\fBmeld\fR [\fB-aceru\fR] [\fB--diff\fR] \fIdir\fR \fIdir\fR [\fIdir\fR]
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    12
\fBmeld\fR [\fB-aceru\fR] [\fB--diff\fR] \fIfile\fR \fIfile\fR [\fIfile\fR]
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    13
\fBmeld\fR [\fB...\fR] [\fB-L LABEL,...\fR] [\fB--label=LABEL,...\fR] \fIfile\fR \fIfile\fR [\fIfile\fR]
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    14
.fi
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    15
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    16
.SH DESCRIPTION
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    17
.LP
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    18
Meld is a graphical diff and merge tool that allows a user to visually compare two or three files simultaneously and edit the files in place. Differences are updated in real-time and highlighted using color coding. Users can also compare two or three directories at a time and launch file comparisons. In addition, users can browse working copies of the code from popular version control systems including CVS, Subversion, Bazaar-ng and Mercurial.
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    19
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    20
More extensive help information for Meld is included in the graphical interface.
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    21
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    22
.SH OPTIONS
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    23
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    24
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    25
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    26
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    27
\fB\fB--version\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    28
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    29
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    30
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    31
displays the current version
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    32
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    33
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    34
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    35
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    36
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    37
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    38
\fB\fB-h, --help\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    39
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    40
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    41
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    42
displays this help information
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    43
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    44
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    45
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    46
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    47
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    48
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    49
\fB\fB-L LABEL, --label=LABEL\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    50
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    51
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    52
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    53
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    54
sets the tab label string for a file 
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    55
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    56
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    57
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    58
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    59
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    60
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    61
\fB\fB-a, --auto-compare\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    62
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    63
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    64
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    65
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    66
automatically compare all differing files on startup
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    67
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    68
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    69
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    70
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    71
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    72
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    73
\fB\fB-c, --context\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    74
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    75
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    76
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    77
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    78
for compatibility with diff command (ignored)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    79
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    80
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    81
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    82
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    83
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    84
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    85
\fB\fB-e, --ed\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    86
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    87
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    88
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    89
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    90
for compatibility with diff command (ignored)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    91
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    92
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    93
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    94
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    95
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    96
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    97
\fB\fB-r, --recursive\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    98
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    99
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   100
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   101
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   102
for compatibility with diff command (ignored)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   103
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   104
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   105
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   106
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   107
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   108
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   109
\fB\fB-u, --unified\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   110
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   111
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   112
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   113
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   114
for compatibility with diff command (ignored)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   115
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   116
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   117
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   118
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   119
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   120
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   121
\fB\fB-diff\fR\fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   122
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   123
.RS 15n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   124
.rt  
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   125
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   126
creates a diff tab for up to three supplied files or directories
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   127
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   128
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   129
.SH EXIT STATUS
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   130
.LP
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   131
The following exit values are returned:
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   132
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   133
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   134
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   135
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   136
\fB\fB0\fR \fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   137
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   138
.RS 7n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   139
.rt
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   140
Successful completion.
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   141
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   142
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   143
.sp
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   144
.ne 2
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   145
.mk
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   146
.na
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   147
\fB\fB>0\fR \fR
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   148
.ad
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   149
.RS 7n
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   150
.rt 
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   151
An error occurred.
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   152
.RE
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   153
.PP
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   154
.SH SEE ALSO
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   155
.LP 
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
   156
diff(1), diff3(1)