t / t5100 / patch0016on commit Merge branch 'ap/maint-merge-strategy-list-fix' (22c4e72)
   1---
   2diff --git a/foo b/foo
   3index e69de29..d95f3ad 100644
   4--- a/foo
   5+++ b/foo
   6@@ -0,0 +1 @@
   7+content
   8