|
|
140.
|
|
|
--cached and --3way cannot be used together.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:137
|
|
|
187.
|
|
|
repository lacks the necessary blob to fall back on 3-way merge.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:3570
|
|
|
188.
|
|
|
Falling back to three-way merge... 
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:3573
|
|
|
190.
|
|
|
Failed to fall back on three-way merge...
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:3605
|
|
|
246.
|
|
|
attempt three-way merge if a patch does not apply
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:4998
|
|
|
322.
|
|
|
No testable commit found.
Maybe you started with bad path parameters?
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bisect.c:985
|
|
|
332.
|
|
|
After fixing the error cause you may try to fix up
the remote tracking information by invoking
"git branch --set-upstream-to= %s%s%s". |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
branch.c:53
|
|
|
333.
|
|
|
Not setting branch %s as its own upstream.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
branch.c:67
|
|
|
334.
|
|
|
Branch '%s' set up to track remote branch '%s' from '%s' by rebasing.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
branch.c:93
|
|
|
335.
|
|
|
Branch '%s' set up to track remote branch '%s' from '%s'.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
branch.c:94
|
