Merge branch 'jk/two-way-merge-corner-case-fix' into maint
[git] / t / t5100 / patch0016
1 ---
2 diff --git a/foo b/foo
3 index e69de29..d95f3ad 100644
4 --- a/foo
5 +++ b/foo
6 @@ -0,0 +1 @@
7 +content
8