Junio C Hamano wrote: > Traditionally, when you have a change in the work tree, and switch to > another branch that has different contents in the modified path, we > errored out by saying: > > error: Entry 'foo' not uptodate. Cannot merge. By the way, could this error message be made less cryptic? It is there since the very beginning, and was not changed during making error messages more user friendly... -- 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
