Welcome to Linux Knowledge Base and Tutorial
"The place where you learn linux"
Mercy Corps

 Create an AccountHome | Submit News | Your Account  

Tutorial Menu
Linux Tutorial Home
Table of Contents

· Introduction to Operating Systems
· Linux Basics
· Working with the System
· Shells and Utilities
· Editing Files
· Basic Administration
· The Operating System
· The X Windowing System
· The Computer Itself
· Networking
· System Monitoring
· Solving Problems
· Security
· Installing and Upgrading
· Linux and Windows

Glossary
MoreInfo
Man Pages
Linux Topics
Test Your Knowledge

Site Menu
Site Map
FAQ
Copyright Info
Terms of Use
Privacy Info
Disclaimer
WorkBoard
Thanks
Donations
Advertising
Masthead / Impressum
Your Account

Communication
Feedback
Forums
Private Messages
Surveys

Features
HOWTOs
News Archive
Submit News
Topics
User Articles
Web Links

Google
Google


The Web
linux-tutorial.info

Who's Online
There are currently, 51 guest(s) and 0 member(s) that are online.

You are an Anonymous user. You can register for free by clicking here

  

merge



SYNOPSIS

       merge [ options ] file1 file2 file3


DESCRIPTION

       merge  incorporates  all  changes  that lead from file2 to
       file3 into file1.  The result ordinarily goes into  file1.
       merge is useful for combining separate changes to an orig­
       inal.  Suppose file2 is the original, and both  file1  and
       file3  are  modifications  of  file2.  Then merge combines
       both changes.

       A conflict occurs if both file1 and file3 have changes  in
       a  common segment of lines.  If a conflict is found, merge
       normally outputs a warning and brackets the conflict  with
       <<<<<<<  and  >>>>>>> lines.  A typical conflict will look
       like this:

              <<<<<<< file A
              lines in file A
              =======
              lines in file B
              >>>>>>> file B

       If there are conflicts, the user should  edit  the  result
       and delete one of the alternatives.


OPTIONS

       -A     Output conflicts using the -A style of diff3(1), if
              supported by diff3.  This merges all changes  lead­
              ing  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  corre­
              sponding  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  over­
              writing file1.

       -q     Quiet;  do  not  warn about conflicts.  -V Print 's
              version number.


DIAGNOSTICS

       It normally does not make sense to merge binary  files  as
       if they were text, but merge tries to do it anyway.

GNU                         1995/06/01                   MERGE(1)
  




Login
Nickname

Password

Security Code
Security Code
Type Security Code


Don't have an account yet? You can create one. As a registered user you have some advantages like theme manager, comments configuration and post comments with your name.

Help if you can!


Amazon Wish List

Did You Know?
You can get all the latest Site and Linux news by checking out our news page.


Friends



Tell a Friend About Us

Bookmark and Share



Web site powered by PHP-Nuke

Is this information useful? At the very least you can help by spreading the word to your favorite newsgroups, mailing lists and forums.
All logos and trademarks in this site are property of their respective owner. The comments are property of their posters. Articles are the property of their respective owners. Unless otherwise stated in the body of the article, article content (C) 1994-2013 by James Mohr. All rights reserved. The stylized page/paper, as well as the terms "The Linux Tutorial", "The Linux Server Tutorial", "The Linux Knowledge Base and Tutorial" and "The place where you learn Linux" are service marks of James Mohr. All rights reserved.
The Linux Knowledge Base and Tutorial may contain links to sites on the Internet, which are owned and operated by third parties. The Linux Tutorial is not responsible for the content of any such third-party site. By viewing/utilizing this web site, you have agreed to our disclaimer, terms of use and privacy policy. Use of automated download software ("harvesters") such as wget, httrack, etc. causes the site to quickly exceed its bandwidth limitation and are therefore expressly prohibited. For more details on this, take a look here

PHP-Nuke Copyright © 2004 by Francisco Burzi. This is free software, and you may redistribute it under the GPL. PHP-Nuke comes with absolutely no warranty, for details, see the license.
Page Generation: 0.08 Seconds