|
17.
|
|
|
--cached and --3way cannot be used together.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:137
|
|
18.
|
|
|
--3way outside a repository
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:139
|
|
19.
|
|
|
--index outside a repository
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:150
|
|
20.
|
|
|
--cached outside a repository
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:153
|
|
21.
|
|
|
Cannot prepare timestamp regexp %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:800
|
|
22.
|
|
|
regexec returned %d for input: %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:809
|
|
23.
|
|
|
unable to find filename in patch at line %d
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:883
|
|
24.
|
|
|
git apply: bad git-diff - expected /dev/null, got %s on line %d
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:921
|
|
25.
|
|
|
git apply: bad git-diff - inconsistent new filename on line %d
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:927
|
|
26.
|
|
|
git apply: bad git-diff - inconsistent old filename on line %d
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:928
|