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 Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 08 Apr 2006 14:12:43 -0700
changeset 2054 e18beba54a7e
parent 2038 5c4496ed152d
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix exception handling on windows. move win32 code into util_win32.py.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
mercurial-crew-with-dirclash