Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'
[git] / t / t4101 / diff.1-3
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,3 +1,3 @@
4  a
5 -b
6  c
7 +b
8 \ No newline at end of file