mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
110 lines
2.5 KiB
Plaintext
110 lines
2.5 KiB
Plaintext
% changing local directly
|
||
merge succeeded
|
||
local
|
||
base
|
||
other
|
||
% printing to stdout
|
||
local
|
||
base
|
||
other
|
||
local:
|
||
local
|
||
base
|
||
% conflicts
|
||
base
|
||
<<<<<<< conflict-local
|
||
not other
|
||
=======
|
||
other
|
||
>>>>>>> conflict-other
|
||
end
|
||
warning: conflicts during merge.
|
||
merge failed
|
||
% --no-minimal
|
||
base
|
||
<<<<<<< conflict-local
|
||
not other
|
||
end
|
||
=======
|
||
other
|
||
end
|
||
>>>>>>> conflict-other
|
||
warning: conflicts during merge.
|
||
% 1 label
|
||
base
|
||
<<<<<<< foo
|
||
not other
|
||
=======
|
||
other
|
||
>>>>>>> conflict-other
|
||
end
|
||
warning: conflicts during merge.
|
||
% 2 labels
|
||
base
|
||
<<<<<<< foo
|
||
not other
|
||
=======
|
||
other
|
||
>>>>>>> bar
|
||
end
|
||
warning: conflicts during merge.
|
||
% too many labels
|
||
abort: can only specify two labels.
|
||
% binary file
|
||
abort: binary-local looks like a binary file.
|
||
% binary file --text
|
||
warning: binary-local looks like a binary file.
|
||
|