log tests/test-merge6 @ 3407:d2b55e3c4e25

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