From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 15 May 2011 03:44:09 GMT
Subject: Re: [PATCH 6/7] update git-stage.po
Message-ID: <20110515034408.GA28245@elie>
In-Reply-To: <7vd3jkr6ms.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

> I would rather see that done as a customized content-level merge backend,
> i.e. at the same level as binary and union merges are specified. Losing
> line number information just for the sake of the generic merge that does
> not have domain knowledge (read: "stupid") is a way suboptimal solution to
> the problem, I would think.

Oh!  You are definitely right.  Thank you.