mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
26 lines
255 B
Plaintext
26 lines
255 B
Plaintext
|
% init
|
||
|
|
adding a
|
||
|
|
% fold in the middle of the queue
|
||
|
|
now at: p1
|
||
|
|
--- a/a
|
||
|
|
+++ b/a
|
||
|
|
@@ -1,1 +1,2 @@
|
||
|
|
a
|
||
|
|
+a
|
||
|
|
p1
|
||
|
|
p3
|
||
|
|
--- a/a
|
||
|
|
+++ b/a
|
||
|
|
@@ -1,1 +1,3 @@
|
||
|
|
a
|
||
|
|
+a
|
||
|
|
+b
|
||
|
|
% fold with local changes
|
||
|
|
abort: local changes found, refresh first
|
||
|
|
--- a/a
|
||
|
|
+++ b/a
|
||
|
|
@@ -1,1 +1,3 @@
|
||
|
|
a
|
||
|
|
+a
|
||
|
|
+b
|