зеркало из
https://github.com/iharh/notes.git
synced 2025-10-31 21:56:08 +02:00
6 строки
256 B
Plaintext
6 строки
256 B
Plaintext
--accept ARG : specify automatic conflict resolution source
|
|
('base', 'working', 'mine-conflict',
|
|
'theirs-conflict', 'mine-full', 'theirs-full')
|
|
|
|
svn resolve --accept working -R <path>
|