Hi, On Wed, 11 Mar 2009, david@xxxxxxx wrote: > there are two types of helpers that can be written > > 1. a low-level part that does the simple merges automaticaly and leaves > behind appropriate conflict markers when it can't > > [...] > > > 2. after a conflict has taken place, a helper to work with the user to > resolve the conflict I thought that from my description on the wiki it was obvious that both are needed. Ciao, Dscho -- 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
