| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Sun, 19 Oct 2008 01:28:35 +0200 | |
| changeset 7155 | 3250da71a769 |
| 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