diff tests/test-tags.out @ 993:6f274afc05c7

Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases
author mpm@selenic.com
date Tue, 23 Aug 2005 02:19:38 -0700
parents 5007e0bdeed2
children 7544700fd931
line wrap: on
line diff
--- a/tests/test-tags.out	Mon Aug 22 01:22:29 2005 -0700
+++ b/tests/test-tags.out	Tue Aug 23 02:19:38 2005 -0700
@@ -10,4 +10,5 @@
 acb14030fe0a21b60322c440ad2d20cf7685a376+ first
 M a
 c8edf04160c7 tip
-c8edf04160c7+b9154636be93 tip
+c8edf04160c7+b9154636be93+ tip
+M .hgtags