Merge branch 'ct/mv-unmerged-path-error' into master

[git] / t / t5100 / patch0017

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