|
46.
|
|
|
Stage mode change [y,n,a,q,d%s ,?]?
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
add-patch.c:15
|
|
47.
|
|
|
Stage deletion [y,n,a,q,d%s ,?]?
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
add-patch.c:16
|
|
48.
|
|
|
Stage this hunk [y,n,a,q,d%s ,?]?
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
add-patch.c:17
|
|
57.
|
|
|
If the patch applies cleanly, the edited hunk will immediately be
marked for staging.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
add-patch.c:810
|
|
62.
|
|
|
y - stage this hunk
n - do not stage this hunk
q - quit; do not stage this hunk or any of the remaining ones
a - stage this and all the remaining hunks
d - do not stage this hunk nor any of the remaining hunks
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
add-patch.c:1009
|
|
96.
|
|
|
--cached and --3way cannot be used together.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:137
|
|
143.
|
|
|
repository lacks the necessary blob to fall back on 3-way merge.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:3570
|
|
144.
|
|
|
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
|
|
146.
|
|
|
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
|
|
202.
|
|
|
attempt three-way merge if a patch does not apply
|
|
|
|
(no translation yet)
|
|
|
|
Located in
apply.c:4998
|