【发布时间】:2014-02-13 14:15:38
【问题描述】:
混帐差异
diff --git a/lids b/lids
index 009d7e8..46447a8 100644
--- a/lids
+++ b/lids
@@ -1,12 +1,12 @@
-FP CA1 CAPS Mapping.pdf
mtool1428_100squaretool.html
+mtool1428_100squaretool.py
Lesson Guide 100square 23LessonIdeas.pdf
Worksheet 100square 0to99.pdf
Worksheet 100square 1to100.pdf
Worksheet 100square Blank.pdf
-Worksheet 100square Challenge 1.pdf
-Worksheet 100square Challenge 2.pdf
+Worksheet 100square Challenge 11.pdf
Worksheet 100square Challenge 3.pdf
+Worksheet 100square Challenge 2.pdf
Worksheet 100square Challenge 4.pdf
Worksheet 100square Challenge 5.pdf
Worksheet 100square Challenge 6.pdf
如何grep删除的以单号开头的字符串和以单+号开头的字符串
【问题讨论】:
-
不要,不要尝试以这种方式过滤来自
diff的行。 (您是否注意到包含以---和+++开头的文件名的行?)