Merge branch 'cb/maint-orphan-merge-noclobber'
[git/kirr.git] / t / t5100 / patch0015
blobad64848873fcd491cda7cd286102c20d4f2ed36e
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