merge-one-file: use common as base, instead of emptiness.
[gitweb.git] / Documentation / git-fmt-merge-msg.txt
2005-11-01 Documentation for git-fmt-merge-msg