author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
Tue, 13 Mar 2007 15:02:33 -0300 | |
changeset 4176 | f9bbcebcacea |
parent 3326 | be8efb6e1cc6 |
child 6338 | 0750f11152fe |
permissions | -rw-r--r-- |
% init foo-base % create alpha in first repo adding alpha % clone foo-base to foo-work 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create beta in second repo adding beta % create gamma in first repo adding gamma % pull into work and merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % revert to changeset 1 to simulate a failed merge 2 files updated, 0 files merged, 0 files removed, 0 files unresolved