author | John Mulligan <phlogistonjohn@asynchrono.us> |
Sat, 15 Mar 2008 15:23:20 -0400 | |
changeset 6311 | a079cf630065 |
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