log tests/test-merge7.out @ 2830:49988d9f0758

age author description
Wed, 09 Aug 2006 13:55:18 -0500 Matt Mackall Merge with crew, fix most tests
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.
Tue, 02 May 2006 18:44:02 +0200 Thomas Arendsen Hein Make hg update more verbose by default (issue12)