Merge branch 'jk/two-way-merge-corner-case-fix' into maint

[git] / t / t5100 / patch0016

---
diff --git a/foo b/foo
index e69de29..d95f3ad 100644
--- a/foo
+++ b/foo
@@ -0,0 +1 @@
+content