|
286.
|
|
|
Cannot amend while merging.
You are currently in the middle of a merge that has not been fully completed. You cannot amend the prior commit unless you first abort the current merge activity.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:18
|
|
287.
|
|
|
Error loading commit data for amend:
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:48
|
|
290.
|
|
|
warning: Tcl does not support encoding '%s'.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:129
|
|
291.
|
|
|
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:149
|
|
292.
|
|
|
Unmerged files cannot be committed.
File %s has merge conflicts. You must resolve them and stage the file before committing.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:172
|
|
293.
|
|
|
Unknown file state %s detected.
File %s cannot be committed by this program.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:180
|
|
296.
|
|
|
Calling pre-commit hook...
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:234
|
|
297.
|
|
|
Commit declined by pre-commit hook.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:249
|
|
298.
|
|
|
Calling commit-msg hook...
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:272
|
|
299.
|
|
|
Commit declined by commit-msg hook.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/commit.tcl:287
|