Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge: respect several options in dialog title

Changeset 0b48ab113179…

Parent 8157176ac33d…

by Yuki KODAMA

Changes to one file · Browse files at 0b48ab113179 Showing diff from parent 8157176ac33d Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
24
25
26
 
27
28
29
 
37
38
39
40
41
42
43
 
44
45
46
 
24
25
26
27
28
29
30
 
38
39
40
 
 
 
 
41
42
43
44
@@ -24,6 +24,7 @@
  gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   gtklib.set_tortoise_icon(self, 'menumerge.ico')   gtklib.set_tortoise_keys(self) + self.set_default_size(350, 120)   self.notify_func = None     if not rev: @@ -37,10 +38,7 @@
  except hglib.RepoError:   gobject.idle_add(self.destroy)   return - - title = _("Merging in ") + hglib.toutf(os.path.basename(repo.root)) - self.set_title(title) - self.set_default_size(350, 120) + self.set_title(_('Merging in %s') % hglib.get_reponame(repo))     vbox = gtk.VBox()   self.add(vbox)