mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
12 lines
332 B
Plaintext
12 lines
332 B
Plaintext
created new head
|
|
% local deleted a file, remote removed
|
|
abort: outstanding uncommitted changes (use 'hg status' to list changes)
|
|
resolving manifests
|
|
removing a
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
% should show a as removed
|
|
R a
|
|
% manifest. should not have a:
|
|
b
|