Mercurial > hg

view tests/test-merge5.out @ 4017:ea6174c96ae1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
catch AttributeError in util.checklink There's no symlink function in the os module on windows. Fixes issue468
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 05 Jan 2007 00:01:51 -0200
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes