Conflict description:

One of the functions in the subversion module is called subversion_diff. The diff module sees this as a hook, and will execute it accordingly. This generates several errors.

Solution:

rename the function subversion_diff to subversion_svndiff and also the reference to it in the subversion_menu function.

Comments

halkeye’s picture

Status: Active » Fixed
Anonymous’s picture

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.