| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
| Thu, 12 Aug 2010 19:40:22 +0900 | |
| changeset 11794 | 80c63b2a29a8 |
| 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