[pacman-dev] Adding a new config file to a package (e.g. mercurial file conflict)