Mercurial > hg
view tests/test-issue619.out @ 9766:4e0d99a5a9f9
i18n-it: synchronized with e06c940d554d
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 25 Oct 2009 12:46:23 +0100 |
parents | cdc458b12f0f |
children | 5b48d819d5f9 |
line wrap: on
line source
adding a marked working directory as branch b adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail abort: can't merge with ancestor done