Mercurial > hg
view tests/test-586.out @ 5227:466323968b23
Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 27 Aug 2007 14:21:04 -0300 |
parents | 720ae5085ee3 |
children | c2a21fe60994 |
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