Linux Tour (1): diff, patch and quilt (lower) 2 quilt
We can use CVs or SVN to manage all code for our own projects. But sometimes we need to use projects maintained by other developers. We need to modify some files, but we cannot directly submit
General overview
diff [Options] source file destination file
Describe
In the simplest case, diff compares the contents of two files (source and destination files). The file name can be-text read by the standard input device. As a special case,
Linux Tour (1): diff, Patch and quilt (bottom) 2 quiltOur own projects can manage all the code with CVS or SVN. But sometimes we use projects that other developers maintain. We need to change some files, but we cannot submit the code directly to the
Linux Tour (1): diff, Patch and quilt (bottom) 2 quiltOur own projects can manage all the code with CVS or SVN. But sometimes we use projects that other developers maintain. We need to change some files, but we cannot submit the code directly to the
Linux Tour (1): diff, Patch and quilt (bottom) 2 quiltOur own projects can manage all the code with CVS or SVN. But sometimes we use projects that other developers maintain. We need to change some files, but we cannot submit the code directly to the
Linux Tour (1): diff, Patch and quilt (bottom) 2 quiltOur own projects can manage all the code with CVS or SVN. But sometimes we use projects that other developers maintain. We need to change some files, but we cannot submit the code directly to the
The diff command compares a given two files in the simplest case. If you use "-" instead of the "file" parameter, the content to be compared will come from standard input. The diff command compares the similarities and differences of text files in a
diff command explanation1. OverviewThere are good text comparison tools available under the Windows system, such as the common beyond Compare,winmerge is a comparison tool for graphical interfaces and very handy, and if you just work under Windows,
You at the command line, enter:
$ diff
Diff will tell you what the difference is between the two files. Its display result is not very understood, below I will explain, how to read the diff.
bg2012082901
One, diff three kinds of formats
For
Common Linux commands (28th)-diff
The diff command is an important tool in linux. It is used to compare the content of files, especially files of different versions, to find the changes. Diff prints the changes of each line in the command line. The
The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion;
products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the
content of the page makes you feel confusing, please write us an email, we will handle the problem
within 5 days after receiving your email.
If you find any instances of plagiarism from the community, please send an email to:
info-contact@alibabacloud.com
and provide relevant evidence. A staff member will contact you within 5 working days.