merge-file: support -p and -q; fix compile warnings

[git/jnareb-git.git] / templates / remotes--

: this is just to ensure the directory exists.