|
|
3.
|
|
|
Committing is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:166
|
|
|
4.
|
|
|
Merging is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:168
|
|
|
5.
|
|
|
Pulling is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:170
|
|
|
6.
|
|
|
Reverting is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:172
|
|
|
7.
|
|
|
It is not possible to %s because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:174
|
|
|
8.
|
|
|
Fix them up in the work tree, and then use 'git add/rm <file>' 
as appropriate to mark resolution and make a commit. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:182
|
|
|
9.
|
|
|
Exiting because of an unresolved conflict.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:190
|
|
|
10.
|
|
|
You have not concluded your merge (MERGE_HEAD exists).
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:195 builtin/merge.c:1332
|
|
|
11.
|
|
|
Please, commit your changes before merging.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:197
|
|
|
12.
|
|
|
Exiting because of unfinished merge.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:198
|
