标签:station foo font cat 打补丁 line lin roo dex
[root@workstation2017 demo]# git diff old new >cc.diff
[root@workstation2017 demo]# cat cc.diff
diff --git a/old/a/p/foo.txt b/new/a/p/foo.txt
index f041bcd..7351245 100644
--- a/old/a/p/foo.txt
+++ b/new/a/p/foo.txt
@@ -1,2 +1,2 @@
-old_line_1
-old_line_2
+new_line_1
+new_line_2
标签:station foo font cat 打补丁 line lin roo dex
原文地址:http://www.cnblogs.com/zengkefu/p/7267086.html