当我使用" diff -u"两个txt文件之间,我只改变了两行,它告诉我,我已经改变了文件中的每一行。这是输出:
Admin@DESKTOP-9A5CFG4 MINGW64 ~/Desktop/singlediff
$ diff -u nutty-pancake.txt nutty-pancake-new.txt
--- nutty-pancake.txt 2016-07-12 16:48:29.465917000 +0200
+++ nutty-pancake-new.txt 2016-07-12 16:49:10.737818500 +0200
@@ -1,61 +1,61 @@
-Nutty Pancake
-
-== Ingredients ==
-
-* 1 cup all-purpose bleached flour
-* 2 teaspoons sugar
-* 1/2 teaspoon salt
-* 1/3 teaspoon baking powder
-* 1/4 teaspoon baking soda
-* 3/4 cup buttermilk
-* 1/4 cup milk
-* 1 large egg
-* 2 tablespoon unsalted butter, melted
-* 1 teaspoon almond extract
-* Vegetable oil for brushing griddle
-
-== Procedure ==
-
-1. Heat a large non-stick skillet or griddle over
- low heat while preparing ingredients.
-
-2. Mix flour, sugar, salt, baking powder, and baking
- soda in medium bowl.
-
-3. Microwave buttermilk and milk in a 2-cup Pyrex
- measuring cup to room temperature, 20 to 30 seconds.
-
-4. Whisk in egg, butter, and almond extract.
-
-5. Add wet ingredients to dry ingredients and whisk until
- just mixed.
-
-6. Return batter to measuring cup, stirring in a teaspoon
- or two of water, if necessary, to make a thick, but pourable batter.
-
-7. Increase heat to medium and generously brush skillet or griddle with
- oil.
-
-8. When oil starts to spider, but before it starts to smoke, pour
- batter, about 1/4 cup at a time.
-
-9. Work in batches, if necessary, to avoid overcrowding.
-
-10. When pancake bottoms are golden brown and tops start to bubble,
- 2 to 3 minutes, flip pancakes.
-
-11. Cook until pancakes are golden brown on remaining side.
-
-12. Repeat, brushing skillet or griddle with oil.
-
-Serve hot.
-
-==Source==
-
-This recipe originally comes from Wikibooks.
-
-http://en.wikibooks.org/w/index.php?oldid=769489
-(last visited May 19, 2012).
-
-Some rights reserved; see http://creativecommons.org/licenses/by-sa/3.0/
-for more information.
+Nutty Pancake
+
+== Ingredients ==
+
+* 1 cup all-purpose bleached flour
+* 2 teaspoons sugar
+* 1/2 teaspoon salt
+* 1/3 teaspoon baking powder
+* 1/4 teaspoon baking soda
+* 3/4 cup buttermilk
+* 1/4 cup milk
+* 1 large egg
+* 2 tablespoon unsalted butter, melted
+* 1 teaspoon walnut extract
+* Vegetable oil for brushing griddle
+
+== Procedure ==
+
+1. Heat a large non-stick skillet or griddle over
+ low heat while preparing ingredients.
+
+2. Mix flour, sugar, salt, baking powder, and baking
+ soda in medium bowl.
+
+3. Microwave buttermilk and milk in a 2-cup Pyrex
+ measuring cup to room temperature, 20 to 30 seconds.
+
+4. Whisk in egg, butter, and walnut extract.
+
+5. Add wet ingredients to dry ingredients and whisk until
+ just mixed.
+
+6. Return batter to measuring cup, stirring in a teaspoon
+ or two of water, if necessary, to make a thick, but pourable batter.
+
+7. Increase heat to medium and generously brush skillet or griddle with
+ oil.
+
+8. When oil starts to spider, but before it starts to smoke, pour
+ batter, about 1/4 cup at a time.
+
+9. Work in batches, if necessary, to avoid overcrowding.
+
+10. When pancake bottoms are golden brown and tops start to bubble,
+ 2 to 3 minutes, flip pancakes.
+
+11. Cook until pancakes are golden brown on remaining side.
+
+12. Repeat, brushing skillet or griddle with oil.
+
+Serve hot.
+
+==Source==
+
+This recipe originally comes from Wikibooks.
+
+http://en.wikibooks.org/w/index.php?oldid=769489
+(last visited May 19, 2012).
+
+Some rights reserved; see http://creativecommons.org/licenses/by-sa/3.0/
+for more information.
我只更改了两次出现的杏仁一词到核桃。 顺便说一句,我在Windows中使用gitbash。