On Tue, Aug 12, 2008 at 17:02, Jan Nieuwenhuizen <janneke-list@xxxxxxxxx> wrote: > On di, 2008-08-12 at 15:38 +0200, Petr Baudis wrote: > >> how exactly did you get the morge conflicts? > > I'm not sure, cannot seem to reproduce them anymore. May > have been pre-0.2 issue or another goof-up over here. Could be, there was a fix for this from me. If you have a .git/info/gitattributes file, you where hit by the bug. But with 0.2 this is gone. Bert > > Thanks. -- 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
