Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3256
- 1a43351889d5
- parent 3242
- a7e006073658
- child 3260
- 37bbdfba30bc
equal
deleted
inserted
replaced
| 3255:51152e85c5e9 | 3256:1a43351889d5 |
|---|---|
| 1037 args = [] | 1037 args = [] |
| 1038 args.append('merge') | 1038 args.append('merge') |
| 1039 self.addArguments(args, opts) | 1039 self.addArguments(args, opts) |
| 1040 if force: | 1040 if force: |
| 1041 args.append("--force") | 1041 args.append("--force") |
| 1042 if self.getPlugin().getPreferences("InternalMerge"): | |
| 1043 args.append("--tool") | |
| 1044 args.append("internal:merge") | |
| 1042 if rev: | 1045 if rev: |
| 1043 args.append("--rev") | 1046 args.append("--rev") |
| 1044 args.append(rev) | 1047 args.append(rev) |
| 1045 | 1048 |
| 1046 dia = HgDialog(self.tr('Merging').format(name), self) | 1049 dia = HgDialog(self.tr('Merging').format(name), self) |
