in above explanation, please replace the last diff command with below.
diff -u a1.txt a2.txt ================================== --- a1.txt 2008-11-17 16:08:14.000000000 -0600 +++ a2.txt 2008-11-17 16:09:05.000000000 -0600 @@ -1,4 +1,5 @@ -bar = Attribute("The bar.") +baz = Attribute("The qux baz.") +bar = Attribute("The qux bar.") frob = Attribute("The frob name.")
name = Attribute("The frob name as text.") ==================================
in above explanation, please replace the last diff command with below.
diff -u a1.txt a2.txt ======= ======= ======= ======
=======
--- a1.txt 2008-11-17 16:08:14.000000000 -0600
+++ a2.txt 2008-11-17 16:09:05.000000000 -0600
@@ -1,4 +1,5 @@
-bar = Attribute("The bar.")
+baz = Attribute("The qux baz.")
+bar = Attribute("The qux bar.")
frob = Attribute("The frob name.")
name = Attribute("The frob name as text.") ======= ======= ======= ======
=======