merge-file: support -p and -q; fix compile warnings
[git] / t / t5100 / msg0001
1 Here is a patch from A U Thor.
2