t7800: Test difftool passing arguments to diff

[git.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a1096e93c6764b1231acf48b974b971fc3aa9ffe..713542fdcd22bd459cc6043a2dbe358724ab1ea0 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2527,7 +2527,7 @@ msgstr "到空分支的非快进式提交没有意义"
 #: builtin/merge.c:1275 builtin/merge.c:1319
 #, c-format
 msgid "%s - not something we can merge"
-msgstr "%s - 不是我们可以合并的东西"
+msgstr "%s - 不能被合并"
 
 #: builtin/merge.c:1385
 #, c-format