author | Thomas Arendsen Hein <thomas@intevation.de> |
Mon, 20 Oct 2008 18:29:44 +0200 | |
changeset 7194 | 040e325e4f69 |
parent 6375 | cdc458b12f0f |
child 11173 | 5b48d819d5f9 |
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: can't merge with ancestor done