On 3/10/07, Junio C Hamano <junkio@xxxxxxx> wrote:
Frank Lichtenheld <frank@xxxxxxxxxxxxxx> writes: > Using Update-existing leads to the client forgetting about the "locally > modified" status of the file which can lead to loss of local changes on > later updates. To me, both of these hunks look correct (the first one is clean merge, the second one is merge with conflicts). Ack?
Ack! m - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html