Paolo Ciarrocchi wrote: > From 0b98769dfe16e3ba8cde698b75cb1067658c38e7 Mon Sep 17 00:00:00 2001 I think you should remove this line. > From: Paolo Ciarrocchi <paolo.ciarrocchi@xxxxxxxxx> > Date: Sun, 19 Nov 2006 23:41:31 +0100 > Subject: [PATCH] One of the comment was not really clear, rephrased to > make it easier to be understood by the reader Wordwrap. Perhaps it would be better to split description into short line, and two-line description. [...] > ------------------------------------------------ > > at this point the two branches have diverged, with different changes > -made in each. To merge the changes made in the two branches, run > +made in each. To merge the changes made in experimental into master run I would rather say: To merge the changes made in the two branches into master, run -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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