On Thu, Jan 15, 2009 at 00:49, Ask Bjørn Hansen <ask@xxxxxxxxxxxxxx> wrote: > On Jan 14, 2009, at 2:55 PM, Johannes Schindelin wrote: >> So.... Which Git version are you are using? Did you test any Git version >> containing the commit d5a84fb(merge-recursive: fail gracefully with >> directory/submodule conflicts)? > > IIRC I tried 1.6.1 and master as of about a week ago. > > I don't see d5a84fb in my repository (and google doesn't find it referenced > anywhere when I search for "directory/submodule conflicts". I checked current master: $ git log --grep="fail gracefully with" returns nothing. Searching the archive I don't see any reference to "fail gracefully with" either. I don't see it on your gitweb [0] either. Did that commit magically dissapear? [0] http://repo.or.cz/w/git/dscho.git -- 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
