Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset b18e77f50202…

Parents 373d9113a083…

Parents d089aa15c3b5…

by Steve Borho

Changes to 2 files · Browse files at b18e77f50202 Showing diff from parent 373d9113a083 d089aa15c3b5 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
347
348
349
 
 
350
351
352
 
365
366
367
 
 
368
369
370
 
347
348
349
350
351
352
353
354
 
367
368
369
370
371
372
373
374
@@ -347,6 +347,8 @@
  self.sci.setMarginWidth(1, 0)   lexer = lexers.get_diff_lexer(self)   self.sci.setLexer(lexer) + if lexer is None: + self.setFont(qtlib.getfont('fontlog').font())   # trim first three lines, for example:   # diff -r f6bfc41af6d7 -r c1b18806486d tortoisehg/hgqt/thgrepo.py   # --- a/tortoisehg/hgqt/thgrepo.py @@ -365,6 +367,8 @@
  else:   lexer = lexers.get_lexer(filename, fd.contents, self)   self.sci.setLexer(lexer) + if lexer is None: + self.setFont(qtlib.getfont('fontlog').font())   self.sci.setText(fd.contents)   self.sci._updatemarginwidth()  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
274
275
276
277
 
278
279
280
 
274
275
276
 
277
278
279
280
@@ -274,7 +274,7 @@
  wdbox.addWidget(wd_detail)   wdbox.addSpacing(4)   - wd_merged = QLabel(_('The workding directory is already <b>merged</b>. ' + wd_merged = QLabel(_('The working directory is already <b>merged</b>. '   '<a href="skip"><b>Continue</b></a> or '   '<a href="discard"><b>discard</b></a> existing '   'merge.'))