view tests/test-586.out @ 6679:d286ec1bdcff

context: fix workingctx.fileflags() execute bit
author Patrick Mezard <pmezard@gmail.com>
date Sun, 15 Jun 2008 13:01:01 +0200
parents 8a5d8fb59ed2
children f1af59451c0c
line wrap: on
line source

adding a
adding b
pulling from ../a
searching for changes
warning: repository is unrelated
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
C b