Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/convert/cvs.py
changeset 34168 698cccf1ad28
parent 34167 6ea92f1b7a87
child 35187 671aba341d90 
--- a/hgext/convert/cvs.py	Fri Jun 30 03:33:15 2017 +0200
+++ b/hgext/convert/cvs.py	Fri Jun 30 03:33:25 2017 +0200
@@ -81,7 +81,7 @@
             db = cvsps.createlog(self.ui, cache=cache)
             db = cvsps.createchangeset(self.ui, db,
                 fuzz=int(self.ui.config('convert', 'cvsps.fuzz')),
-                mergeto=self.ui.config('convert', 'cvsps.mergeto', None),
+                mergeto=self.ui.config('convert', 'cvsps.mergeto'),
                 mergefrom=self.ui.config('convert', 'cvsps.mergefrom'))
 
             for cs in db:
hg-stable