From: John Keeping Date: Sun, 07 Apr 2013 10:38:43 GMT Subject: Re: What's cooking in git.git (Apr 2013, #02; Fri, 5) Message-ID: <20130407103843.GU2222@serenity.lan> In-Reply-To: <7vip40bolc.fsf@alter.siamese.dyndns.org> On Fri, Apr 05, 2013 at 03:27:11PM -0700, Junio C Hamano wrote: > * jk/merge-tree-added-identically (2013-03-27) 1 commit > - merge-tree: fix "same file added in subdir" > > We would most likely want to change things the other way around. > > Expecting a reroll. I was hoping to get some feedback on my most recent message [1] before sending a reroll of this. [1] http://article.gmane.org/gmane.comp.version-control.git/219378