I am using tortoiseHg and beyond compare 4 pro for a java project. When I encounter a conflict beyond compare opens a 2-diff view but it doesn't let me edit anything!!!!
Please Help!!
Thanks
Did you follow the TortoiseHG configuration instructions from Beyond Compare's website?
If you've followed the above instructions and it didn't resolve the problem, what version of TortoiseHG are you using?
If you are using Beyond Compare Standard with TortoiseHg you will need to modify the MergeTools.rc file located at C:\\Program Files\\TortoiseHg\\hgrc.d\\MergeTools.rc
.
I needed to modify this line:
beyondcompare4.args=$local $other $base /mergeoutput=$output /ro /lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged /automerge /reviewconflicts /solo
To be this:
beyondcompare4.args=$other $local /savetarget=$output /lro /title1=parent1 /title2=parent2 /automerge /reviewconflicts /solo
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.