log tests/test-merge1 @ 3328:49966b5ab16f

age author description
Wed, 11 Oct 2006 16:35:09 +0200 Benoit Boissinot fix traceback of extdiff after a merge
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.