合併XLS我要合併,同時更新與TortoiseHg的庫包括兩個MS Excel的.xls文件,我也得到了以下錯誤:與TortoiseHg
tool tortoisemerge can't handle binary
tool kdiff3 can't handle binary
tool tortoisemerge can't handle binary
tool docdiff can't handle binary
abort: response expected
當我將這些行添加到hgrc文件:
[merge-patterns]
**.xls = docdiff
我得到另一個錯誤:
merging test.xls
merging test.xls failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
我在做什麼錯?當我從命令行運行docdiff時,它運行成功。
這不是一個答案。你說你已經想出了答案,但你沒有說出答案的實際內容。 – 2014-06-24 09:48:44