Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge1.out
author mpm@selenic.com
Tue, 23 Aug 2005 02:19:38 -0700
changeset 993 6f274afc05c7
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
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

merging for b
merging b
This is file b1
merging for b
merging b
merging for b
merging b
mercurial-crew-with-dirclash