Merge branch 'ap/checkout-no-progress-for-non-tty' into maint
[git] / t / t4101 / diff.0-3
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,2 +1,3 @@
4  a
5 -b
6 +c
7 +b
8 \ No newline at end of file