Merge branch 'cb/maint-orphan-merge-noclobber'
[git/kirr.git] / t / t9151 / .gitignore
blob587c37dba34b4e550012563a6411c763a4459135
1 foo
2 foo.svn