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 e03500e86fe9…

Parents 4578cd6f941c…

Parents 4a17b61ddfbd…

by Steve Borho

Changes to one file · Browse files at e03500e86fe9 Showing diff from parent 4578cd6f941c 4a17b61ddfbd Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​chunks.py Stacked
 
273
274
275
276
 
277
278
279
 
687
688
689
690
691
692
693
 
273
274
275
 
276
277
278
279
 
687
688
689
 
690
691
692
@@ -273,7 +273,7 @@
  wlock = repo.wlock()   try:   repo.wopener(self.currentFile, 'wb').write( - hglib.fromunicode(self.diffbrowse.origcontents)) + repo['.'][self.currentFile].data())   fp = cStringIO.StringIO()   chunks[0].write(fp)   for c in kchunks: @@ -687,7 +687,6 @@
  else:   self.sci.markerAdd(start+i, self.vertical)   start += len(chunk.lines) + 1 - self.origcontents = fd.olddata   self.countselected = 0   self.curchunks = chunks   for c in chunks[1:]: