Merge branch 'jc/checkout-merge-base'
[git] / t / t9151 / .gitignore
1 foo
2 foo.svn