linux - 将狂想曲 DiffMerge 设置为 svn 合并工具

Question

我正在尝试将狂想曲 DiffMerge 设置为 SVN 中的合并工具。

在我设置的 .subversion/config 中:

[helpers]
    merge-tool-cmd = /opt/rhapsody/i386/7.5.2.1/DiffMerge "$2" "$3" "$1"

在 Rhapsody/DiffMerge 中我设置了:

#!/bin/bash                                                                                                                                                                                                                                 
DIFFMERGE_PATH=/opt/rhapsody/i386/7.5.2.1
DIFFMERGE_EXEC=${DIFFMERGE_PATH}/diffmerge.exe                                                                                   
${DIFFMERGE_EXEC} -xmerge "$2" "$3" -base "$1" -mergeReport mergeReport.logs

使用 DiffMerge IBM 帮助: http://pic.dhe.ibm.com/infocenter/rhaphlp/v7r6/index.jsp?topic=%2Fcom.ibm.rhp.diffmerge.doc%2Ftopics%2Frhp_t_col_specifying_diffmerge_cmdline_syn.html

---

当冲突出现时:

Select: (p) postpone,
        (mf) mine-full, (tf) theirs-full,
        (s) show all options: l
Invalid option.

---

有人遇到过这个问题吗？

BR亚当

Answer 1

已解决，我已将 svn 版本更改为最新版本 (1.8.8)并设置merge-tool-cmd = DiffMerge

就这些。

BR亚当