author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Fri, 24 Aug 2007 00:52:28 +0200 | |
changeset 5214 | 551958d5082c |
parent 4748 | 8808ea7da86b |
child 6375 | cdc458b12f0f |
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: there is nothing to merge, just use 'hg update' or look at 'hg heads' done