Diff: Difference between revisions
New page: thumb|64px|Diff and Merge There are many times when you need to be able to compare versions of files, or directory trees. Diff tools are the answer, and are a fund... |
No edit summary |
||
| Line 14: | Line 14: | ||
diff -rq -x .svn ./work/myproject/ ./work/myproject-copy2/ | diff -rq -x .svn ./work/myproject/ ./work/myproject-copy2/ | ||
</source> | </source> | ||
The <code>diff</code> command is fast, but often the output is hard to read to find the exact difference. You might try piping the output of the diff command to a graphical tool: | |||
<source lang="bash"> | |||
diff fileA fileB | kdiff3 - | |||
</source> | |||
By using the dash option to kdiff3, you're telling it to read from STDIN, so it uses the output of the former commands being piped to it. | |||
=== Compressed files === | |||
<code>zdiff</code> is a tool that can be used directly on compressed files (like zcat, zgrep, etc.) | |||
== KDiff3 == | == KDiff3 == | ||
