Heya, On Sun, Jan 25, 2009 at 15:17, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: >> >> merge (B) A # Merge... >> > merge B parent A' # Merge... >> merge B with A' # Merge... > merge B Merge bla/blub > parent A' bla/blub Oh goody, more painting! I was wondering when the next pick-a-word contest would be! -- Cheers, Sverre Rabbelier -- 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