author | Eric Hopper <hopper@omnifarious.org> |
Sat, 09 Sep 2006 18:25:06 -0700 | |
changeset 3447 | ef1032c223e7 |
parent 3352 | be8efb6e1cc6 |
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