From: Nix <nix@esperi.org.uk>
Date: Tue, 24 Jul 2007 06:56:00 GMT
Subject: Re: [RFC PATCH] Re: Empty directories...
Message-ID: <87y7h6l27z.fsf@hades.wkstn.nix>
In-Reply-To: <86ps2ithyl.fsf@lola.quinscape.zz>

On 24 Jul 2007, David Kastrup spake thusly:
> But merging will become nicer if the permissions actually stay
> associated with the file rather than the file name.  Even in things
> like /etc backups, blobs not infrequently relocate from one place to
> another when the system gets updated.

Even without that we'd need to merge without context, i.e. with totally
independent lines, for such a file. So it's not the standard git file
merge.