builtin/diff: fix botched update of usage comment
In the previous commit, an attempt was made to correct the "N=1, M=0" case. However, the fix was botched and it introduced two half-correct sections by mistake. Combine these half-correct sections into one fully correct section. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Jun 23, 2020 at 05:19 UTC
c592fd4c83021b4f098012b3307298fff923c6e7
1 file changed
+1
-4
builtin/diff.c
+1
-4
@@ -284,11 +284,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
284
* N=1, M=0:
285
* tree vs files (diff-index)
286
*
287
- * N=1, M=0:
288
- * tree vs cache (diff-index --cached)
289
- *
287
* N=1, M=0, --cached:
291
- * tree vs files (diff-index)
288
+ * tree vs cache (diff-index --cached)
289
*
290
* N=2, M=0:
291
* tree vs tree (diff-tree)