That is really weird leslie unless somehting changed again. Can you send me the output of hg resolve cause i ma not getting that.
On Sep 13, 11:54 am, "Leslie P. Polzer" <[email protected]> wrote: > On Sep 12, 4:32 pm, Mackram <[email protected]> wrote: > > > Done. Can you please pull in and make sure it works (on my side the > > tests all pass) > > I get conflicts in two files: > > merging pub/scripts/weblocks.js > warning: conflicts during merge. > merging pub/scripts/weblocks.js failed! > merging src/application.lisp > merging src/control-flow/dialog.lisp > merging src/dependencies.lisp > merging src/utils/html.lisp > merging src/utils/suggest.lisp > merging src/versioning.lisp > merging src/widgets/widget/widget.lisp > merging test/application.lisp > merging test/bundling.lisp > warning: conflicts during merge. > merging test/bundling.lisp failed! > merging test/control-flow/dialog.lisp > merging test/versioning.lisp > merging weblocks.asd > 81 files updated, 11 files merged, 0 files removed, 2 files unresolved > use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to > abandon > > Am I missing something? --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "weblocks" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/weblocks?hl=en -~----------~----~----~----~------~----~------~--~---
