Mercurial > hg
view tests/test-issue619.out @ 11736:c00f03a4982e stable 1.6.2
i18n-pt_BR: synchronized with 87dcf758309d
author | Wagner Bruna <wbruna@yahoo.com> |
---|---|
date | Mon, 02 Aug 2010 13:18:32 -0300 |
parents | 6f1d1ed3e19a |
children |
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: merging with a working directory ancestor has no effect done