Set rhapsody DiffMerge as svn merge-tool
I am trying to install rhapsody DiffMerge as a merge tool in SVN.
I installed .subversion / config:
[helpers]
merge-tool-cmd = /opt/rhapsody/i386/7.5.2.1/DiffMerge "$2" "$3" "$1"
in Rhapsody / DiffMerge I installed:
#!/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
via IBM DiffMerge help: http://pic.dhe.ibm.com/infocenter/rhaphlp/v7r6/index.jsp?topic=%2Fcom.ibm.rhp.diffmerge.doc%2Ftopics%2Frhp_t_col_specifying_diffmerge_cmdline_syn.
When the conflict appears:
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: l
Invalid option.
Does anyone have this problem?
BR Adam
+3
source to share