mercurial/debugcommands.py
changeset 36318 3f67c56a5fd7
parent 36309 94a1ff16f362
child 36335 d639f60c8eb3
equal deleted inserted replaced
36317:f14879f61cd8 36318:3f67c56a5fd7
   161             total += 1
   161             total += 1
   162 
   162 
   163     if mergeable_file:
   163     if mergeable_file:
   164         linesperrev = 2
   164         linesperrev = 2
   165         # make a file with k lines per rev
   165         # make a file with k lines per rev
   166         initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
   166         initialmergedlines = ['%d' % i for i in xrange(0, total * linesperrev)]
   167         initialmergedlines.append("")
   167         initialmergedlines.append("")
   168 
   168 
   169     tags = []
   169     tags = []
   170 
   170 
   171     wlock = lock = tr = None
   171     wlock = lock = tr = None