Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
[git] / t / t9151 / .gitignore
1 foo
2 foo.svn