author | Martin Geisler <mg@lazybytes.net> |
Wed, 23 Dec 2009 20:31:35 +0100 | |
branch | stable |
changeset 10132 | ebf69364e80f |
parent 6375 | cdc458b12f0f |
child 11173 | 5b48d819d5f9 |
permissions | -rw-r--r-- |
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