Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 1297:496074e0a38b
Add win32text extension module.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 21 Sep 2005 14:23:25 -0700 |
parents | 5a034646e472 |
children | ced2d3620f95 |
line wrap: on
line source
removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to merge across branches or -C to lose changes)