author | Matt Mackall <mpm@selenic.com> |
Sat, 15 May 2010 21:24:23 -0500 | |
changeset 11181 | 6e65b451b62e |
parent 11173 | 5b48d819d5f9 |
child 11417 | 6f1d1ed3e19a |
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