[SVN-4426] merge tool specified in config file isn't invoked

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.8.x
• Fix Version/s: 1.9.0
• Component/s: tools
• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 17/Sep/13 05:18
• Updated: 27/Oct/18 16:30
• Resolved: 27/May/14 18:27

Description

Following this guide (http://codingundertheinfluence.blogspot.com/2010/01/using-
meld-as-your-external-diff3.html), I specified an external merge tool in 
~/.subversion/config
config file has the line:
merge-tool-cmd = /usr/local/bin/svn-diff3-meld
svn-diff3-meld is like described in the article.

'svn update' hit the conflict requiring non-trivial merge, however, merge tool 
isn't called at all.

subversion-1.8.1
FreeBSD 10.0

Original issue reported by yurivict