问题描述
昨天我可以使用外部工具 filemerge 合并 sourcetree 中的文件.今天sourcetree要我注册，注册成功后就启动不了filemerge了.
yesterday I could merge files in sourcetree with the external tool filemerge. Today, sourcetree wanted me to register me, and after my successful registration, I couldnt start filemerge.
当我从文件的上下文菜单中选择启动外部差异工具"时，会出现 4 个文件(备份、基础、本地和远程)，但文件合并立即退出.
When I choose "Launch external diff tool" from the contextmenu of a file, 4 files appear (Backup, base, local and remote) but filemerge quits immediately.
当我启动外部差异时，filemerge 在左侧显示为/dev/null 作为源.我该如何解决?在首选项中，我选择 filemerge 作为外部差异工具.我是否必须手动编写源树的 diff 命令，以提供正确的本地文件版本?我该怎么做?
When I launch external diff, filemerge displays in the left /dev/null as source. How can I fix it? In preferences I choose filemerge as external diff tool. Have I to write the diff command for source tree manually, to give it the right local version of my file? How can I do it?
谢谢
推荐答案
我在使用 SourceTree 时遇到了同样的问题，我尝试使用在外部合并工具中打开".FileMerge 应用程序立即退出.
I had the same problem with SourceTree where I tried to use "open in external merge tool". The FileMerge app exited immediately.
我在一个或另一个地方删除的文件中没有合并冲突，而是在一个刚刚更改的单个文件中.
I did not have the merge conflict in a file that had been deleted one place or another, but in a single file that just changed.
我找不到根本原因，但可以使用命令行解决:
I could not find the root cause but could work around using the command line:
git mergetool
这打开FileMerge就好了，我可以解决FileMerge中的冲突，保存，退出，回到SourceTree，刷新，冲突解决了.
This opened FileMerge just fine and I could resolved the conflict in FileMerge, save, quit, back to SourceTree, refresh, and the conflict was resolved.
这篇关于SourceTree filemerge 立即退出并创建 4 个文件.如何解决?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！