-A | Output conflicts using the -A style of diff3(1), if supported by diff3. This merges all changes leading from file2 to file3 into file1, and generates the most verbose output. |
-E, -e | These options specify conflict styles that generate less information than -A. See diff3(1) for details. The default is -E. With -e, merge does not warn about conflicts. |
-L" label" |
| This option may be given up to three times, and specifies labels to be used in place of the corresponding file names in conflict reports. That is, "merge -L x -L y -L z a b c" generates output that looks like it came from files x, y and z instead of from files a, b and c. |
-p | Send results to standard output instead of overwriting file1. |
-q | Quiet; do not warn about conflicts. |
-V | Print RCSs version number. |
|