Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge: replace all relative imports

Changeset f08b0f0b93f3…

Parent b9c9bb4439f8…

by Steve Borho

Changes to one file · Browse files at f08b0f0b93f3 Showing diff from parent b9c9bb4439f8 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​merge.py Stacked
 
13
14
15
16
17
18
 
19
20
21
 
133
134
135
136
137
138
139
 
13
14
15
 
 
 
16
17
18
19
 
131
132
133
 
134
135
136
@@ -13,9 +13,7 @@
 from thgutil.i18n import _  from thgutil import hglib, paths   -from hggtk import gtklib -from hggtk import gdialog -from hggtk import hgcmd +from hggtk import gtklib, commit, gdialog, hgcmd    class MergeDialog(gtk.Window):   """ Dialog to merge revisions of a Mercurial repo """ @@ -133,7 +131,6 @@
  commit.grab_focus()     def commit(self, button): - import commit   dlg = commit.run(ui.ui())   dlg.set_modal(True)   dlg.set_notify_func(self.commit_notify, dlg)