log tests/test-merge1 @ 4337:23068518deca

age author description
Tue, 26 Dec 2006 14:17:48 +0100 Thomas Arendsen Hein Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
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.