From: Linus Torvalds Date: Mon, 18 Apr 2005 02:56:28 GMT Subject: Re: [PATCH] "checkout-cache -m" writes unmerged contents for each stage. Message-ID: In-Reply-To: <7vfyxovm6j.fsf@assigned-by-dhcp.cox.net> On Sun, 17 Apr 2005, Junio C Hamano wrote: > > One small detail. What about the "-x" bit? You'll need to merge those kinds of changes separately for now. We'll have to resolve that too, right now I think the -x bit gets lost on a merge simply because we just write the temp-files, something merges them, and does an "update-cache" on the merged result, and we'll pick up the -x bit (or rather, lack of one) at that point. Linus