log tests/test-conflict @ 3399:5dbb3a991bbf

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