Merge branch 'jk/execv-dashed-external' into maint

[git/debian.git] / t / t4101 / diff.1-3

--- a/frotz
+++ b/frotz
@@ -1,3 +1,3 @@
 a
-b
 c
+b
\ No newline at end of file