Merge branch 'maint-1.6.0' into maint-1.6.1
[git/mjg.git] / t / t4101 / diff.0-1
blob1010a88f4727373c20e7ab46515a79b9d3cd9675
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,2 +1,3 @@
4  a
5  b
6 +c