> Quoting Junio C Hamano <junkio@xxxxxxx>: > Subject: Re: git rebase: unexpected conflict > > "Michael S. Tsirkin" <mst@xxxxxxxxxxxxxx> writes: > > > Junio, is the following patch correct? > > Looks sane to me. You can take it then :) -- MST - 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