mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +03:00
15 lines
494 B
Plaintext
15 lines
494 B
Plaintext
% 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
|