Differences

This shows you the differences between two versions of the page.

--- docs:diff:examples [2015/09/09 09:05] – sAKIyIZQFyLRGSwxKbk 146.185.234.48
+++ docs:diff:examples [2015/09/15 05:14] (current) – old revision restored 91.89.129.106
@@ Line 1: / Line 1: @@
-http://generictoprolxl.gq/#3420 generic toprol xl,
+====== diff(1) examples ======
+===== files used =====
+file a:
+<code - a>
+
+
+
+
+
+
+
+
+
+
+</code>
+file b ("06" is missing):
+<code - b>
+
+
+
+
+
+
+
+
+
+</code>
+file c ("06a" inserted):
+<code - c>
+
+
+
+
+
+
+a
+
+
+
+
+</code>
+file d ("06a" replaces "06"):
+<code - d>
+
+
+
+
+
+a
+
+
+
+
+</code>
+===== one deleted line =====
+''diff a b''
+<code>
+d5
+< 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 @@
+
+
+
+-06
+
+
+
+</code>
+''diff -e a b''
+<code>
+d
+</code>
+===== one additional line =====
+''diff a c''
+<code>
+d7
+> 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 @@
+
+
+
++06a
+
+
+
+</code>
+''diff -e a c''
+<code>
+a
+a
+.
+</code>
+===== one line changed =====
+''diff a d''
+<code>
+c6
+< 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 @@
+
+
+
+-06
++06a
+
+
+
+</code>
+''diff -e a d''
+<code>
+c
+a
+.
+</code>
+===== output of "diff -u" explained =====
+<HTML>
+<pre>
+	--- <span style="color:red">a</span><span style="background-color:#ffd0d0">   </span><span style="color:red">2014-04-09 11:59:40.347723727 +0200</span>
+	+++ <span style="color:green">d</span><span style="background-color:#d0ffd0">   </span><span style="color:green">2014-04-09 12:12:33.541634228 +0200</span>
+	@@ <span style="color:red">-3,7</span> <span style="color:green">+3,7</span> @@
+	 03
+	 04
+	 05
+	<span style="color:red">-06</span>
+	<span style="color:green">+06a</span>
+	 07
+	 08
+	 09
+</pre>
+</HTML>
+| <html><span style="color:red">a</span></html>   | file name 1 |
+| <html><span style="color:green">b</span></html> | file name 2 |
+| <html><span style="background-color:#ffd0d0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></html> | a TAB char as separator |
+| <html><span style="background-color:#d0ffd0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></html> | a TAB char as separator |
+| <html><span style="color:red">2014-04-09 11:59:40.347723727 +0200</span></html>   | date of file 'a' |
+| <html><span style="color:green">2014-04-09 12:12:33.541634228 +0200</span></html> | date of file 'b' |
+| <html>@@ <span style="color:red">-3,7</span> <span style="color:green">+3,7</span> @@</html> | a 'hunk' |
+| <html><span style="color:red">-3,7</span></html>   | range of the original file ('a') with '3' representing the starting line number and '7' the number of lines the hunk applies to |
+| <html><span style="color:green">+3,7</span></html> | range of the original file ('b') with '3' representing the starting line number and '7' the number of lines the hunk applies to |
+| <html><span style="color:red">-06</span></html>    | removed line |
+| <html><span style="color:green">+06a</span></html> | added line   |
+===== see also =====
+  * man diff(1)
+  * http://en.wikipedia.org/wiki/Diff