Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.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 | 7544700fd931 |
children | b2ae81a7df29 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a