view 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 source

unknown
acb14030fe0a tip
acb14030fe0a21b60322c440ad2d20cf7685a376 first
tip                                1:b9154636be938d3d431e75a7c906504a079bfe07
first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376
b9154636be93 tip
M a
b9154636be93+ tip
acb14030fe0a+ first
acb14030fe0a21b60322c440ad2d20cf7685a376+ first
M a
c8edf04160c7 tip
c8edf04160c7+b9154636be93+ tip
M .hgtags