| author | Mads Kiilerich <mads@kiilerich.com> |
| Thu, 15 Jul 2010 13:24:02 +0200 | |
| branch | stable |
| changeset 11571 | 636554d58665 |
| 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