Merge branch 'kb/maint-rebase-autosquash'

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

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