Merge branch 'mm/maint-hint-failed-merge'
[git] / t / t9151 / .gitignore
1 foo
2 foo.svn