Welcome to Linux Knowledge Base and Tutorial
"The place where you learn linux"
International Medical 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

Man Pages
Linux Topics
Test Your Knowledge

Site Menu
Site Map
Copyright Info
Terms of Use
Privacy Info
Masthead / Impressum
Your Account

Private Messages

News Archive
Submit News
User Articles
Web Links


The Web

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

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




       rediff ORIGINAL EDITED

       rediff EDITED

       rediff {--help | --version}

       editdiff FILE

       editdiff {--help | --version}


       You can use rediff to correct a hand-edited unified  diff.
       Take  a  copy  of  the  diff you want to edit, and edit it
       without changing any offsets or counts (the lines that be­
       gin  ``@@'').  Then run rediff, telling it the name of the
       original diff file and the name of the one you have  edit­
       ed,  and it will output the edited diff file but with cor­
       rected offsets and counts.

       A small script, editdiff, is provided for editing  a  diff
       file in-place.

       The types of changes that are currently handled are:

       ˇ  Modifying  the  text  of  any  file  content  line  (of

       ˇ  Adding new line insertions or deletions.

       ˇ  Adding, changing or removing context  lines.  Lines  at
          the  context  horizon  are  dealt with by adjusting the
          offset and/or count.

       ˇ  Adding a single hunk (@@-prefixed section).

       ˇ  Removing multiple hunk (@@-prefixed sections).

       Alternatively, if only one argument  is  provided,  it  is
       taken to be the edited file and the counts and offsets are
       adjusted as appropriate. Some assumptions  are  made  when
       used  in  this  mode. See recountdiff(1) for more informa­

       Tim Waugh <twaugh@redhat.com>.

patchutils                 13 May 2002                  REDIFF(1)

An undefined database error occurred. SELECT distinct pages.pagepath,pages.pageid FROM pages, page2command WHERE pages.pageid = page2command.pageid AND commandid =

Help us cut cost by not downloading the whole site!
Use of automated download sofware ("harvesters") such as wget, httrack, etc. causes the site to quickly exceed its bandwidth limitation and therefore is expressedly prohibited. For more details on this, take a look here



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?
The Linux Tutorial welcomes your suggestions and ideas.


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.09 Seconds