Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-4426

merge tool specified in config file isn't invoked

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 1.8.x
    • Fix Version/s: 1.9.0
    • Component/s: tools
    • Labels:
      None

      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

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: