Fix conflicts

diff --cc core/parser/parser.factor
Simple merge

diff --cc core/words/words-docs.factor
Simple merge

diff --cc extra/calendar/format/format-tests.factor
Simple merge

diff --cc extra/calendar/format/format.factor
index af536c25850a508f51961eee1bbdf7ba5d5cdbb3,33cc8c63fe99858509085b3eec16f54e74f01023..26daaddc40b7422a175ffd8ca831687b3315e918
--- 1/extra/calendar/format/format.factor
--- 2/extra/calendar/format/format.factor
+++ b/extra/calendar/format/format.factor
@@@ -1,50 -1,8 +1,50 @@@
- USING: math math.parser kernel sequences io\r
 -USING: math math.parser kernel sequences io calendar\r
 -accessors arrays io.streams.string splitting math.order\r
 -combinators accessors debugger ;\r
++USING: math math.order math.parser kernel sequences io\r
 +accessors arrays io.streams.string splitting\r
 +combinators accessors debugger\r
 +calendar calendar.format.macros ;\r
  IN: calendar.format\r
  \r
 +: pad-00 number>string 2 CHAR: 0 pad-left ;\r
 +\r
 +: pad-0000 number>string 4 CHAR: 0 pad-left ;\r
 +\r
 +: pad-00000 number>string 5 CHAR: 0 pad-left ;\r
 +\r
 +: write-00 pad-00 write ;\r
 +\r
 +: write-0000 pad-0000 write ;\r
 +\r
 +: write-00000 pad-00000 write ;\r
 +\r
 +: hh hour>> write-00 ;\r
 +\r
 +: mm minute>> write-00 ;\r
 +\r
 +: ss second>> >integer write-00 ;\r
 +\r
 +: D day>> number>string write ;\r
 +\r
 +: DD day>> write-00 ;\r
 +\r
 +: DAY day-of-week day-abbreviations3 nth write ;\r
 +\r
 +: MM month>> write-00 ;\r
 +\r
 +: MONTH month>> month-abbreviations nth write ;\r
 +\r
 +: YYYY year>> write-0000 ;\r
 +\r
 +: YYYYY year>> write-00000 ;\r
 +\r
 +: expect ( str -- )\r
 +    read1 swap member? [ "Parse error" throw ] unless ;\r
 +\r
 +: read-00 2 read string>number ;\r
 +\r
 +: read-000 3 read string>number ;\r
 +\r
 +: read-0000 4 read string>number ;\r
 +\r
  GENERIC: day. ( obj -- )\r
  \r
  M: integer day. ( n -- )\r

diff --cc extra/http/server/server.factor
index 6c128b3d83f7c590270da8460342dee8f1f0c585,f89028a4796bb22cb044ba84b538d0ffce31fe63..ad04812c63b89a04e218ed3d483aaf27e0a45474
--- 1/extra/http/server/server.factor
--- 2/extra/http/server/server.factor
+++ b/extra/http/server/server.factor
@@@ -162,11 -155,11 +162,11 @@@ TUPLE: dispatcher default responders 
          [ nip ] [ drop default>> ] if
      ] [
          over first over responders>> at*
-         [ >r drop 1 tail-slice r> ] [ drop default>> ] if
+         [ >r drop rest-slice r> ] [ drop default>> ] if
      ] if ;
  
 -M: dispatcher call-responder ( path dispatcher -- response )
 -    [ add-base-path ] [ find-responder call-responder ] 2bi ;
 +M: dispatcher call-responder* ( path dispatcher -- response )
 +    find-responder call-responder ;
  
  TUPLE: vhost-dispatcher default responders ;
  
@@@ -239,18 -227,16 +239,18 @@@ SYMBOL: exit-continuatio
      '[ exit-continuation set @ ] callcc1 exit-continuation off ;
  
  : split-path ( string -- path )
-     "/" split [ empty? not ] subset ;
+     "/" split [ empty? not ] filter ;
  
 +: init-request ( -- )
 +    H{ } clone base-paths set
 +    [ ] link-hook set
 +    [ ] form-hook set ;
 +
  : do-request ( request -- response )
      [
 -        H{ } clone base-paths set
 -        [ ] link-hook set
 -        [ ] form-hook set
 -
 -        [ log-request ]
 +        init-request
          [ request set ]
 +        [ log-request ]
          [ path>> split-path main-responder get call-responder ] tri
          [ <404> ] unless*
      ] [

diff --cc extra/locals/locals-docs.factor
Simple merge

diff --cc extra/locals/locals.factor
Simple merge

diff --cc extra/webapps/planet/planet.factor
Simple merge