Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
992:f859e9cba1b9 | 993:6f274afc05c7 |
---|---|
8 b9154636be93+ tip | 8 b9154636be93+ tip |
9 acb14030fe0a+ first | 9 acb14030fe0a+ first |
10 acb14030fe0a21b60322c440ad2d20cf7685a376+ first | 10 acb14030fe0a21b60322c440ad2d20cf7685a376+ first |
11 M a | 11 M a |
12 c8edf04160c7 tip | 12 c8edf04160c7 tip |
13 c8edf04160c7+b9154636be93 tip | 13 c8edf04160c7+b9154636be93+ tip |
14 M .hgtags |