log tests/test-merge1 @ 2478:287b7da4aeaa

age author description
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.