|
63.
|
|
|
No conflicts in working tree.
|
|
|
|
В рабочем дереве конфликтов нет.
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../conflicts.py:100
|
|
64.
|
|
|
path conflict
|
|
|
|
конфликт путей
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../conflicts.py:114
|
|
65.
|
|
|
contents conflict
|
|
|
|
конфликт содержания
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../conflicts.py:116
|
|
66.
|
|
|
text conflict
|
|
|
|
текстовый конфликт
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../conflicts.py:118
|
|
67.
|
|
|
duplicate id
|
|
|
|
совпадающий id
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../conflicts.py:120
|
|
68.
|
|
|
duplicate
|
|
|
|
дубликат
|
|
Translated and reviewed by
Rail Aliiev
|
|
|
|
Located in
../conflicts.py:122
|
|
69.
|
|
|
parent loop
|
|
|
|
начальный контур
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../conflicts.py:124
|
|
70.
|
|
|
unversioned parent
|
|
|
|
вне версионный предок
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../conflicts.py:126
|
|
71.
|
|
|
missing parent
|
|
|
|
отсутствует предок
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../conflicts.py:128
|
|
72.
|
|
|
deleting parent
|
|
|
|
удален предок
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../conflicts.py:130
|