log tests/test-filebranch @ 2398:2d5745fd03fa

age author description
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.
Mon, 13 Mar 2006 13:05:41 +0100 Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Tue, 23 Aug 2005 02:19:38 -0700 mpm Clean up some merge logic
Sun, 21 Aug 2005 21:59:55 -0700 mpm Fix long-standing excessive file merges