Heya, On Tue, Sep 8, 2009 at 09:15, Junio C Hamano<gitster@xxxxxxxxx> wrote: > + /* would_overwrite */ > + "Your local changes to '%s' will be clobbered by merge. Aborting.", Still scary, shouldn't that be s/will be/would be/ ? > + /* not_uptodate_file */ > + "Your local changes to '%s' will be clobbered by merge. Aborting.", Ditto. > + /* not_uptodate_dir */ > + "Updating '%s' would lose untracked files in it. Aborting.", Not sure, but maybe s/in it// -- 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