[BUG] Wrong permissions after merge

[Wouter van Heyst]

On Fri, Feb 10, 2006 at 07:27:38PM +0100, Jan Hudec wrote:
> Hello All,
> 
> Daniel Silverstone complained on IRC few minutes ago, that when there are
> conflicts, the conflicted files are written with mode 600, instead of the
> original mode.

Just for attribution, it was Chad Phillips who brought it up, Daniel
confirmed seeing the behaviour.

Wouter van Heyst