Code

Add new test to ensure git-merge handles pull.twohead and pull.octopus
[git.git] / t / .gitignore
1 /trash directory
2 /test-results