{ "content": [ { "type": "text", "text": "# MERGE (man)\n\n## NAME\n\nmerge - three-way file merge\n\n## SYNOPSIS\n\nmerge [ options ] file1 file2 file3\n\n## DESCRIPTION\n\nmerge incorporates all changes that lead from file2 to file3 into file1. The result ordinar‐\nily goes into file1. merge is useful for combining separate changes to an original. Suppose\nfile2 is the original, and both file1 and file3 are modifications of file2. Then merge com‐\nbines both changes.\n\n## Sections\n\n- **NAME**\n- **SYNOPSIS**\n- **DESCRIPTION**\n- **OPTIONS** (6 subsections)\n- **DIAGNOSTICS**\n- **IDENTIFICATION**\n- **SEE ALSO**\n- **BUGS**\n\nUse structuredContent.sections for detailed options, examples, and full documentation.\n" } ], "structuredContent": { "command": "MERGE", "section": "", "mode": "man", "summary": "merge - three-way file merge", "synopsis": "merge [ options ] file1 file2 file3", "tldr_summary": null, "tldr_examples": [], "tldr_source": null, "flags": [ { "flag": "-A", "long": null, "arg": null, "description": "all changes leading from file2 to file3 into file1, and generates the most verbose output." }, { "flag": "-A", "long": null, "arg": null, "description": "diff3(1) for details. The default is -E. With -e, merge does not warn about con‐ flicts." }, { "flag": "-L", "long": null, "arg": null, "description": "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." }, { "flag": "-p", "long": null, "arg": null, "description": "" }, { "flag": "-q", "long": null, "arg": null, "description": "" }, { "flag": "-V", "long": null, "arg": null, "description": "" } ], "examples": [], "see_also": [ { "name": "diff3", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/diff3/1/json" }, { "name": "diff", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/diff/1/json" }, { "name": "rcsmerge", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/rcsmerge/1/json" }, { "name": "co", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/co/1/json" }, { "name": "info", "section": "1", "url": "https://www.chedong.com/phpMan.php/man/info/1/json" } ], "section_outline": [ { "name": "NAME", "lines": 2, "subsections": [] }, { "name": "SYNOPSIS", "lines": 2, "subsections": [] }, { "name": "DESCRIPTION", "lines": 17, "subsections": [] }, { "name": "OPTIONS", "lines": 1, "subsections": [ { "name": "-A -A", "lines": 3, "flag": "-A" }, { "name": "-E -e -A", "lines": 3, "flag": "-A" }, { "name": "-L", "lines": 5, "flag": "-L" }, { "name": "-p", "lines": 1, "flag": "-p" }, { "name": "-q", "lines": 1, "flag": "-q" }, { "name": "-V", "lines": 1, "flag": "-V" } ] }, { "name": "DIAGNOSTICS", "lines": 2, "subsections": [] }, { "name": "IDENTIFICATION", "lines": 6, "subsections": [] }, { "name": "SEE ALSO", "lines": 13, "subsections": [] }, { "name": "BUGS", "lines": 6, "subsections": [] } ], "sections": { "NAME": { "content": "merge - three-way file merge\n", "subsections": [] }, "SYNOPSIS": { "content": "merge [ options ] file1 file2 file3\n", "subsections": [] }, "DESCRIPTION": { "content": "merge incorporates all changes that lead from file2 to file3 into file1. The result ordinar‐\nily goes into file1. merge is useful for combining separate changes to an original. Suppose\nfile2 is the original, and both file1 and file3 are modifications of file2. Then merge com‐\nbines both changes.\n\nA conflict occurs if both file1 and file3 have changes in a common segment of lines. If a\nconflict is found, merge normally outputs a warning and brackets the conflict with <<<<<<<\nand >>>>>>> lines. A typical conflict will look like this:\n\n<<<<<<< file A\nlines in file A\n=======\nlines in file B\n>>>>>>> file B\n\nIf there are conflicts, the user should edit the result and delete one of the alternatives.\n", "subsections": [] }, "OPTIONS": { "content": "", "subsections": [ { "name": "-A -A", "content": "all changes leading from file2 to file3 into file1, and generates the most verbose\noutput.\n", "flag": "-A" }, { "name": "-E -e -A", "content": "diff3(1) for details. The default is -E. With -e, merge does not warn about con‐\nflicts.\n", "flag": "-A" }, { "name": "-L", "content": "This option may be given up to three times, and specifies labels to be used in place\nof the corresponding file names in conflict reports. That is,\nmerge -L x -L y -L z a b c generates output that looks like it came from files x, y\nand z instead of from files a, b and c.\n", "flag": "-L" }, { "name": "-p", "content": "", "flag": "-p" }, { "name": "-q", "content": "", "flag": "-q" }, { "name": "-V", "content": "", "flag": "-V" } ] }, "DIAGNOSTICS": { "content": "Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.\n", "subsections": [] }, "IDENTIFICATION": { "content": "Author: Walter F. Tichy.\nManual Page Revision: 5.10.1; Release Date: 2022-02-19.\nCopyright © 2010-2022 Thien-Thi Nguyen.\nCopyright © 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.\nCopyright © 1982, 1988, 1989 Walter F. Tichy.\n", "subsections": [] }, "SEE ALSO": { "content": "diff3(1), diff(1), rcsmerge(1), co(1).\n\nThe full documentation for RCS is maintained as a Texinfo manual. If the info(1) and RCS\nprograms are properly installed at your site, the command\n\ninfo rcs\n\nshould give you access to the complete manual. Additionally, the RCS homepage:\n\nhttp://www.gnu.org/software/rcs/\n\nhas news and links to the latest release, development site, etc.\n", "subsections": [] }, "BUGS": { "content": "It normally does not make sense to merge binary files as if they were text, but merge tries\nto do it anyway.\n\n\n\nGNU RCS 5.10.1 2022-02-19 MERGE(1)", "subsections": [] } } } }