log tests/test-merge7 @ 4348:b633f470944e

age author description
Fri, 01 Dec 2006 13:34:09 +0100 Benoit Boissinot switch to the .hg/store layout, fix the tests
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.