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 91d8b94131a0

Parents 3471fed35c23

Parents 18e7e5ed7a5a

by Steve Borho

Changes to one file · Browse files at 91d8b94131a0 Showing diff from parent 3471fed35c23 18e7e5ed7a5a Diff from another changeset...

 
671
672
673
674
675
 
676
677
678
 
671
672
673
 
 
674
675
676
677
@@ -671,8 +671,7 @@
  try:   fctx = self._links[line][0]   if fctx.rev() != self._lastrev: - s = hglib.get_revision_desc(fctx, - hglib.fromunicode(self.annfile)) + s = hglib.get_revision_desc(fctx, self.annfile)   self.showMessage.emit(s)   self._lastrev = fctx.rev()   except IndexError: