164 "PreferUnbundle": False, |
164 "PreferUnbundle": False, |
165 "ServerPort": 8000, |
165 "ServerPort": 8000, |
166 "ServerStyle": "", |
166 "ServerStyle": "", |
167 "CleanupPatterns": "*.orig *.rej *~", |
167 "CleanupPatterns": "*.orig *.rej *~", |
168 "CreateBackup": False, |
168 "CreateBackup": False, |
|
169 "InternalMerge": False, |
169 } |
170 } |
170 |
171 |
171 from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper |
172 from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper |
172 self.__projectHelperObject = HgProjectHelper(None, None) |
173 self.__projectHelperObject = HgProjectHelper(None, None) |
173 try: |
174 try: |