Mercurial > hg

view tests/test-merge5.out @ 5536:fdee5d614fcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: force svn:executable when execute-bit is not supported The util.is_exec fallback would be to ask subversion for the current value of svn:executable. Setting it directly is just simpler.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 11 Nov 2007 19:34:00 +0100
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