From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 14 Mar 2008 00:17:10 GMT
Subject: Re: [PATCH] merge-recursive: handle file mode changes
Message-ID: <frcg66$2nb$1@ger.gmane.org>
In-Reply-To: <20080313224741.GA5000@localhost>

Clemens Buchacher wrote:

> Handle file mode changes similarly to changes of content. If the file mode
> changed in only one branch, keep the changed version. If the file mode
> changed in both branches, prompt the user to choose one by reporting a
> conflict.

Shouldn't it print "CONFLICT(mode/mode)" then?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git