0

我正在尝试为 Windows 配置融合。刚才，我添加了python变量环境和以下步骤：

git config --global merge.tool meld
git config --global mergetool.meld.path /c/Users/andarno/Downloads/meld-1.5.2/bin/meld

但是当我尝试合并更改时，会出现以下消息：

Normal merge conflict for 'folder/script.js':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (meld):
Traceback (most recent call last):
  File "c:/Users/ben/Desktop/Meld/meld/bin/meld", line 98, in <module>
    libintl = cdll.intl
  File "c:\Python27\lib\ctypes\__init__.py", line 435, in __getattr__
    dll = self._dlltype(name)
  File "c:\Python27\lib\ctypes\__init__.py", line 365, in __init__
    self._handle = _dlopen(self._name, mode)
WindowsError: [Error 126] The specified module could not be found
folder/script.js seems unchanged.

我不确定错误的原因，有人有想法吗？

4

0 回答 0