
288
|
Chapter 3: Linux Commands
This is the Title of the Book, eMatter Edition
Copyright © 2006 O’Reilly & Associates, Inc. All rights reserved.
If there are conflicts, the user should edit the result and delete one
of the alternatives.
Options
-e Don’t warn about conflicts.
-p Send results to standard output instead of overwriting file1.
-q Quiet; do not warn about conflicts.
-A Output conflicts using the -A style of diff3. This merges all
changes leading from file2 to file3 into file1 and generates the
most verbose output.
-E Output conflict information in a less verbose style than -A;
this is the default.
-L label
Specify up to three labels to be used in place of the corre-
sponding filenames in conflict reports. That is:
merge -L x -L y -L z file_a file_b file_c
generates output that looks as if it came from x, y, and z
instead of from file_a, file_b, and file_c.
-V Print version number.
mesg
mesg [option]
Change the ability of other users to send write messages to your
terminal. With no options, display the permission status.
Options
n Forbid write messages.
y Allow write messages (the default).
metamail
metamail [options] [filename]
Normally invisible to users, metamail is used to send and display
rich text or multimedia email using MIME typing metadata. Mail-
reading programs normally call metamail to determine how to
handle the data, but metamail can be called directly by developers
who want to use it