The Open Source Swiss Army Knife

/unix/commandline/
/unix/commandline/ + sub-categories
http://www.sirfsup.com/
web directory content
    
      

Not logged in
Chat Register Login
return to:  http:/www.sirfsup.com      /unix   /commandline 
Permalink: diff.htm
Title: add
article options : please login   |  print view





  1. diffone:

    this is from diff one

    difftwo:

    this is frmo diff two

    diff diffone difftwo > diffresult

    diffresult:

    1c1
    < this is from diff one
    ---
    > this is frmo diff two
    





  2. diffone:

    this is from diff one
    this is line 2 which will be deleted from diffone but not from difftwo

    difftwo:

    this is frmo diff two

    diff diffone difftwo > diffresult

    diffresult:

    1,2c1
    < this is from diff one
    < this is line 2 which will be deleted from diffone but not from difftwo
    ---
    > this is frmo diff two
    




  3. diffone:

    this is from diff one
    this is line 2 which will be deleted from diffone but not from difftwo
    this is line 3 which will remain in both diffone and difftwo

    difftwo:

    this is frmo diff two
    this is line 3 which will remain in both diffone and difftwo

    diff diffone difftwo > diffresult

    diffresult:

    1,2c1
    < this is from diff one
    < this is line 2 which will be deleted from diffone but not from difftwo
    ---
    > this is frmo diff two
    3a3
    > 
    




  4. diffone:

    this is from diff one
    this is line 2 which will be deleted from diffone but not from difftwo
    this is line 3 which will be deleted from diffone but not from difftwo
    this is line 4 which will remain in both diffone and difftwo

    difftwo:

    this is frmo diff two
    this is line 3 which will remain in both diffone and difftwo
    this is line 3 which will be deleted from diffone but not from difftwo

    diff diffone difftwo > diffresult

    diffresult:

    
    1,2c1,2
    < this is from diff one
    < this is line 2 which will be deleted from diffone but not from difftwo
    ---
    > this is frmo diff two
    > this is line 3 which will remain in both diffone and difftwo
    4d3
    < this is line 4 which will remain in both diffone and difftwo
    

Leave a Reply
Your Name:     anonymous
Your Email:
Website:  
Comments:

The author will be notified of your reply.
return to top