Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...

[git] / t / t5100 / patch0015

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