Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint
[git] / t / t4101 / diff.1-0
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,3 +1,2 @@
4  a
5  b
6 -c