diff options
Diffstat (limited to 'RepSys/svn.py')
| -rw-r--r-- | RepSys/svn.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/RepSys/svn.py b/RepSys/svn.py index 1483a02..4e073dc 100644 --- a/RepSys/svn.py +++ b/RepSys/svn.py @@ -205,7 +205,8 @@ class SVN: return [x.split() for x in output.split()] return None - def merge(self, url1, url2=None, rev1=None, rev2=None, path=None, **kwargs): + def merge(self, url1, url2=None, rev1=None, rev2=None, path=None, + **kwargs): cmd = ["merge"] if rev1 and rev2 and not url2: cmd.append("-r") |