Fischglas

You've loaded an old revision of the document! If you save it, you will create a new version with this data.

====== diff(1) examples ======

===== files used =====

file a:
<code - a>
01
02
03
04
05
06
07
08
09
10
</code>

file b ("06" is missing):
<code - b>
01
02
03
04
05
07
08
09
10
</code>

file c ("06a" inserted):
<code - c>
01
02
03
04
05
06
06a
07
08
09
10
</code>

file d ("06a" replaces "06"):
<code - d>
01
02
03
04
05
06a
07
08
09
10
</code>

===== one deleted line =====

''diff a b''
<code>
6d5
< 06
</code>

''diff -u a b''
<code>
--- a 2014-04-09 11:59:40.347723727 +0200
+++ b 2014-04-09 11:59:51.651574650 +0200
@@ -3,7 +3,6 @@
 03
 04
 05
-06
 07
 08
 09
</code>

''diff -e a b''
<code>
6d
</code>

===== one additional line =====

''diff a c''
<code>
6d7
> 06a
</code>

''diff -u a c''
<code>
--- a 2014-04-09 11:59:40.347723727 +0200
+++ c 2014-04-09 12:08:41.088672486 +0200
@@ -4,6 +4,7 @@
 04
 05
 06
+06a
 07
 08
 09
</code>

''diff -e a c''
<code>
6a
06a
.
</code>

===== one line changed =====

''diff a d''
<code>
6c6
< 06
---
> 06a
</code>

''diff -u a d''
<code>
--- a 2014-04-09 11:59:40.347723727 +0200
+++ d 2014-04-09 12:12:33.541634228 +0200
@@ -3,7 +3,7 @@
 03
 04
 05
-06
+06a
 07
 08
 09
</code>

''diff -e a d''
<code>
6c
06a
.
</code>

===== output of "diff -u" explained =====

===== see also =====

* man diff(1)
  * http://en.wikipedia.org/wiki/Diff

Edit summary

Note: By editing this page you agree to license your content under the following license: CC Attribution-Share Alike 4.0 International