Posted to tcl by dgp at Tue Mar 01 18:42:06 GMT 2011view raw

  1. $ diff -u changes-original changes
  2. --- changes-original 2011-03-01 13:37:28.055000000 -0500
  3. +++ changes 2011-03-01 13:37:28.119000000 -0500
  4. @@ -1,6 +1,9 @@
  5. Recent user-visible changes to Tcl:
  6. +<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<
  7.  
  8. RCS: @(#) $Id: changes,v 1.136.2.27 2010/09/08 17:38:32 dgp Exp $
  9. +======= original content above; conflict below =============
  10. +>>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>
  11.  
  12. 1. No more [command1] [command2] construct for grouping multiple
  13. commands on a single command line.
  14. @@ -5858,7 +5861,7 @@
  15.  
  16. 2003-07-16 (bug fix)[756791] corrected assumption that Tcl_Free == free
  17.  
  18. -2003-07-16 (feature enhancement) -DTCL_UTF_MAX=6 compile option forces
  19. +2003-07-16 (feature enhancement) -DTCL_UTF_MAX=6 compile option forces
  20. internal UCS-4 representation of Unicode (default is recommended UCS-2).
  21.  
  22. 2003-07-16 (bug fix)[767578] 64-bit corrections in thread notifier.
  23. @@ -6099,7 +6102,7 @@
  24.  
  25. 2004-05-13 (new feature)[TIP 142] [interp limit] (fellows)
  26.  
  27. -2004-05-14 (bug fix)[940278,922848] [clock] notices $::env(TZ) changes,
  28. +2004-05-14 (bug fix)[940278,922848] [clock] notices $::env(TZ) changes,
  29. gmt works on all platforms. (kenny, welton, glessner)
  30.  
  31. 2004-05-16 (feature rewrite) bytecode execution of {expand} changed
  32.