OSDN Git Service

Fix an issue where the message "The number of automatically merged changes: %1\nThe...
authorJun Tajima <56220423+tjmprm77@users.noreply.github.com>
Fri, 30 Apr 2021 02:51:48 +0000 (11:51 +0900)
committerGitHub <noreply@github.com>
Fri, 30 Apr 2021 02:51:48 +0000 (11:51 +0900)
commita7f476fcfb6eaad15d29140309ddb407091a102f
tree20f15c23d19594ee578d255c97d9cdcbfb7384eb
parent665a65a32b87afc019f28c57772b5a8ac0e2ae29
Fix an issue where the message "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" is not translated. (#763)
Src/ImgMergeFrm.cpp
Src/MergeDoc.cpp