Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2054:e18beba54a7e
fix exception handling on windows.
move win32 code into util_win32.py.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sat, 08 Apr 2006 14:12:43 -0700 |
parents | 5c4496ed152d |
children | b2ae81a7df29 |
line wrap: on
line source
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)