Code

merge: make branch.<name>.mergeoptions correctly override merge.<option>
[git.git] / t / .gitignore
1 /trash directory*
2 /test-results