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-merge5.out
author Matt Mackall <mpm@selenic.com>
Tue, 10 Oct 2006 03:39:44 -0500
changeset 3323 39fd6e82ea38
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
merge: pull user messages out to hg.py - add _update for shadowing in clone - add _showstats helper - remove update parameter defaults - move stats message and merge help messages

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
mercurial-crew-with-dirclash