log tests/test-merge7 @ 3415:ec6f400cff4d

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