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-hup.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 3853 c0b449154a90
child 3917 a413f5c29c46
permissions -rw-r--r--
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

0
0
adding changesets
killed!
transaction abort!
rollback completed
.hg:
00changelog.i
journal.dirstate
requires
store

.hg/store:
00changelog.i
mercurial-crew-with-dirclash