log tests/test-merge4 @ 3481:f699d4eb25d9

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