From: Jeff King Date: Tue, 21 Apr 2009 18:05:30 GMT Subject: Re: correct git merge behavior or corner case? Message-ID: <20090421180529.GA7583@coredump.intra.peff.net> In-Reply-To: <20090421195434.3a01676d@gmail.com> On Tue, Apr 21, 2009 at 07:54:34PM +0200, MichaƂ Kiedrowicz wrote: > And here is a test case: > [...] > + echo "hello" > date && > + git add date && > + git commit -m initial && > + > + git branch parallel && > + > + echo "hello" > LICENSE && > + cp LICENSE LICENSE-copy && > + git add LICENSE && > + git commit -m LICENSE && I thought the point was about _empty_ renames. This is a small but non-zero rename. -Peff