将rhapsody DiffMerge设置为svn merge-tool

Question

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

in I've set .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亚当