Mercurial > hg
diff tests/test-conflict @ 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 | 0902ffece4b4 |
| children | c71420b186b0 |