Merge branch 'maint'

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

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