| author | Wagner Bruna <wbruna@yahoo.com> |
| Sat, 26 Jun 2010 21:29:39 -0300 | |
| branch | stable |
| changeset 11477 | 9374e3c214f9 |
| parent 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: merging with a working directory ancestor has no effect done