我想将rhapsody 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 Adam